Commit Graph

8 Commits

Author SHA1 Message Date
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
2e462a3c0d waypoint 2015-04-13 20:29:54 -04:00
Philip C Monk
ff6a9c3198 ~doznec boots 2015-04-01 19:57:38 -04:00
Philip C Monk
c246a061ad notification-only subscription path 2015-03-26 19:26:39 -04:00
Philip C Monk
681b8e3960 subs boot 2015-03-13 17:47:29 -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