Commit Graph

11 Commits

Author SHA1 Message Date
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
Anton Dyudin
33bd5366cc hook/door/dill-belt/mar 2015-04-07 16:07:10 -07:00
Philip C Monk
f55f5bc295 moving stuff around 2015-03-11 20:37:37 -04:00
Anton Dyudin
5436ac1870 Various fix 2015-03-11 16:51:23 -07:00
Anton Dyudin
52c26318fe ^X fix, flit cleaning 2015-01-26 13:53:35 -08:00
Anton Dyudin
a61bf1b9ba De-floppery 2015-01-19 13:54:49 -08:00
Anton Dyudin
535ff73f20 Added :reboot 2015-01-12 13:25:06 -08:00
Anton Dyudin
7d6426874a Promoted sh-utils to proper /+ library 2015-01-11 17:13:34 -08:00
Anton Dyudin
90f638e8ca Project second pony is go. 2015-01-11 00:00:36 -08:00
Anton Dyudin
84b07d333e refactored ++peer boilerplate 2015-01-09 18:21:25 -08:00
Ubuntu
7165dc93da added into, reload, and solid 2014-10-03 22:31:16 +00:00