Philip C Monk
|
ca788cac3c
|
Merge remote-tracking branch 'origin/test' into typedclay
Conflicts:
urb/urbit.pill
urb/zod/main/app/helm/core.hook
urb/zod/main/arvo/ford.hoon
|
2015-04-23 20:46:25 -04:00 |
|
Philip C Monk
|
dd0716eb72
|
Merge branch 'master' into typedclay
Conflicts:
n/t.c
urb/urbit.pill
urb/zod/main/app/reload/core.hook
urb/zod/main/app/shell/core.hook
urb/zod/main/app/solid/core.hook
urb/zod/main/arvo/dill.hoon
urb/zod/main/arvo/eyre.hoon
urb/zod/main/arvo/ford.hoon
urb/zod/main/arvo/gall.hoon
urb/zod/main/arvo/hoon.hoon
urb/zod/main/mar/json/door.hook
urb/zod/main/mar/md/door.hook
urb/zod/main/mar/txt/door.hook
v/raft.c
v/unix.c
|
2015-04-22 20:18:19 -04:00 |
|
Philip C Monk
|
7ae4742d10
|
boots again
|
2015-04-16 20:22:39 -04:00 |
|
Philip C Monk
|
b62bacbf1d
|
annotated merges seem to be working
|
2015-04-13 17:29:39 -04:00 |
|
Philip C Monk
|
9e10039dfc
|
bug fixing
|
2015-04-08 20:51:34 -04:00 |
|
Philip C Monk
|
c7d8cfd114
|
mostly working userlevel conflict merge
|
2015-04-07 18:24:16 -04:00 |
|
Philip C Monk
|
939c129539
|
bug fixes
|
2015-04-06 19:20:28 -04:00 |
|
Philip C Monk
|
76fd6824a6
|
:merge rework
|
2015-04-03 21:31:57 -04:00 |
|
Philip C Monk
|
21e3d981d4
|
historical .^
|
2015-03-30 18:12:18 -04:00 |
|
Philip C Monk
|
c246a061ad
|
notification-only subscription path
|
2015-03-26 19:26:39 -04:00 |
|
Anton Dyudin
|
cc45140ca6
|
Cached %bake
Conflicts:
urb/zod/main/arvo/ford.hoon
urb/zod/main/mar/react-snip/door.hook
urb/zod/main/mar/react/door.hook
v/raft.c
|
2015-03-24 16:30:30 -04:00 |
|
Philip C Monk
|
995d006e7a
|
sub downloads files, but doesn't start terminal
|
2015-03-12 20:38:12 -04:00 |
|
Philip C Monk
|
f55f5bc295
|
moving stuff around
|
2015-03-11 20:37:37 -04:00 |
|