Galen Wolfe-Pauly
1b8eb395d5
Merge branch 'master' of https://github.com/urbit/urbit
2014-08-04 13:22:08 -07:00
Galen Wolfe-Pauly
84c793149a
Merge branch 'master' of https://github.com/urbit/urbit
2014-08-04 12:50:37 -07:00
Galen Wolfe-Pauly
0d92e753d5
Merge branch 'master' of https://github.com/urbit/urbit
2014-08-04 12:38:02 -07:00
ault011
9b6b5d5c1e
Merge branch 'master' of https://github.com/urbit/urbit
2014-08-04 12:05:40 -07:00
Galen Wolfe-Pauly
f9fa38180a
Merge branch 'urbjs'
2014-08-03 12:04:55 -07:00
Galen Wolfe-Pauly
18b3b48c07
Merge branch 'master' of https://github.com/urbit/urbit
2014-08-03 12:04:19 -07:00
C. Guy Yarvin
a4445a1a93
Merge branch 'master' of github.com:urbit/urbit
2014-08-02 16:40:49 -07:00
pcmonk
6222f8fd1f
Merge branch 'master' into klay
...
Conflicts:
urb/urbit.pill
2014-08-01 16:53:42 -07:00
pcmonk
21780ebe27
Merge branch 'master' into e2e-real
...
Conflicts:
urb/urbit.pill
2014-08-01 16:46:00 -07:00
pcmonk
e25214fd5a
Merge branch 'master' into e2e-real
...
Conflicts:
urb/urbit.pill
2014-08-01 16:27:44 -07:00
Jared Hance
e5711ca255
Merge branch 'master' into klay
...
Conflicts:
urb/urbit.pill
urb/zod/arvo/zuse.hoon
2014-08-01 14:02:51 -04:00
Jared Hance
05fc5f57b8
Various fixes, including timers
2014-08-01 10:54:31 -04:00
Galen Wolfe-Pauly
0269db25c3
Merge branch 'master' of https://github.com/urbit/urbit
2014-07-31 16:26:47 -07:00
C. Guy Yarvin
1829cb7b87
Merge branch 'turbomem'
...
Conflicts:
urb/urbit.pill
2014-07-31 13:38:05 -07:00
C. Guy Yarvin
6ccb227b12
Merge branch 'master' of github.com:urbit/urbit
...
Conflicts:
urb/urbit.pill
2014-07-31 13:25:06 -07:00
C. Guy Yarvin
5c3223ba1f
More memory pls.
2014-07-31 13:23:02 -07:00
C. Guy Yarvin
d5396d7aa7
Clean up some markdown stuff.
2014-07-30 21:28:48 -07:00
Jared Hance
3d8419493d
Merge branch 'master' into klay
...
Conflicts:
urb/urbit.pill
2014-07-30 15:14:38 -04:00
pcmonk
3c57663b02
Merge branch 'master' of https://github.com/urbit/urbit
2014-07-30 11:12:30 -07:00
C. Guy Yarvin
9cf8cff6ff
Merge branch 'master' of github.com:urbit/urbit
...
Conflicts:
urb/zod/main/pro/down/core.hoon
2014-07-30 10:53:58 -07:00
C. Guy Yarvin
64be83c562
Various fixes and improvements.
2014-07-30 10:53:30 -07:00
pcmonk
ea79c59be2
Merge branch 'master' into e2e-real
...
Conflicts:
urb/urbit.pill
urb/zod/arvo/gall.hoon
urb/zod/arvo/zuse.hoon
2014-07-29 17:39:49 -07:00
Jared Hance
201a115f04
Merge branch 'master' into klay
...
Conflicts:
urb/urbit.pill
2014-07-29 13:25:18 -04:00
pcmonk
12ad8e5ff0
Merge branch 'master' into e2e-real
...
Conflicts:
urb/urbit.pill
2014-07-28 10:56:39 -07:00
C. Guy Yarvin
17476dd154
Merge branch 'master' of github.com:urbit/urbit
2014-07-27 12:18:22 -07:00
pcmonk
4e14219db6
Merge branch 'master' into e2e-real
...
Conflicts:
urb/urbit.pill
2014-07-25 19:34:51 -07:00
Galen Wolfe-Pauly
7667ebba60
Merge branch 'master' of https://github.com/urbit/urbit
2014-07-25 12:11:06 -07:00
cgyarvin
ac9d397cf9
Merge pull request #145 from yebyen/i386
...
I386/any architecture support
2014-07-25 12:02:15 -07:00
Kingdon Barrett
b31b1d3574
you can specify "any" to make this work on i386
...
or amd64, or for example arm if it works on arm
2014-07-25 15:00:53 -04:00
Kingdon Barrett
59b5cad535
for the i386
2014-07-25 15:00:53 -04:00
Kingdon Barrett
2a3cf832dc
ragel is a build dep now
2014-07-25 15:00:53 -04:00
C. Guy Yarvin
62c405543f
Merge branch 'master' of github.com:urbit/urbit
2014-07-25 09:02:51 -07:00
C. Guy Yarvin
f9f538a9bc
Fix a typo.
2014-07-25 09:02:32 -07:00
C. Guy Yarvin
1ae027d6cf
Ford compiles - still needs some syntax.
2014-07-24 13:29:16 -07:00
C. Guy Yarvin
791a14d655
Merge branch 'master' of github.com:urbit/urbit
2014-07-24 11:16:50 -07:00
Jared Hance
4b88daa0cc
Can boot subs now!
2014-07-24 11:11:40 -04:00
C. Guy Yarvin
331947db7a
Code complete on ford.
2014-07-23 16:23:53 -07:00
Jared Hance
bdcb77ce88
Merge branch 'master' into klay
...
Conflicts:
urb/zod/arvo/zuse.hoon
2014-07-22 15:03:59 -04:00
Jared Hance
de2a9b6729
Broken.
2014-07-22 14:56:04 -04:00
Jared Hance
2b5f044f7c
zuse compiles again...
2014-07-22 10:11:03 -04:00
C. Guy Yarvin
14b6f2dea7
Merge branch 'master' of github.com:urbit/urbit
...
Conflicts:
urb/urbit.pill
2014-07-21 15:54:29 -07:00
Galen Wolfe-Pauly
218bd25471
Merge branch 'master' of https://github.com/urbit/urbit
2014-07-21 11:42:07 -07:00
John Dulin
5029579e0e
Merge branch 'master' of https://github.com/urbit/urbit
2014-07-20 23:19:05 -07:00
C. Guy Yarvin
78094fec66
Merge branch 'master' of github.com:urbit/urbit
2014-07-18 17:51:37 -07:00
pcmonk
6a693a398c
Merge branch 'eyre-stuff'
...
Conflicts:
urb/urbit.pill
2014-07-17 16:16:28 -07:00
Jared Hance
2e8b2aee22
Initial klay stuff.
...
Clay.hoon doesn't work yet, haven't done subscriptions.
Should probably changes yakis to only reference yaki mugs rather than
yakis themselves - and have a blob map in the dome. Otherwise
subscriptions and merges will suck for large stuff.
2014-07-17 11:40:52 -04:00
C. Guy Yarvin
e308ced2d8
Merge branch 'master' of github.com:urbit/urbit
...
Conflicts:
urb/urbit.pill
2014-07-16 11:56:15 -07:00
C. Guy Yarvin
47694371b8
Minor tweaks.
2014-07-16 11:54:53 -07:00
Jared Hance
2241d0011b
Merge branch 'clay'
...
Conflicts:
urb/urbit.pill
2014-07-16 13:56:34 -04:00
Jared Hance
e547b32554
Fix crash due to the change in %clay storage model
2014-07-10 09:49:59 -04:00
