Commit Graph

13 Commits

Author SHA1 Message Date
Philip C Monk
c6f86e7b6a Merge branch 'test' into dish
Conflicts:
	include/v/vere.h
	urb/urbit.pill
	urb/zod/arvo/ames.hoon
	urb/zod/arvo/hoon.hoon
	v/loop.c
	v/raft.c
2014-11-04 16:42:02 -05:00
Philip C Monk
5242925469 Merge branch 'test' into shell
Conflicts:
	include/v/vere.h
	urb/urbit.pill
	urb/zod/arvo/clay.hoon
	urb/zod/arvo/eyre.hoon
	urb/zod/arvo/hoon.hoon
	urb/zod/main/mar/hook/door.hook
	urb/zod/main/mar/psal/door.hook
	urb/zod/main/mar/txt/door.hook
	urb/zod/main/pub/src/doc/ref/vol/1.md
	v/loop.c
	v/raft.c
	v/reck.c
	v/unix.c
2014-11-04 15:22:33 -05:00
C. Guy Yarvin
d5aee61ff1 Performs a full :solid. 2014-10-25 12:30:36 -07:00
C. Guy Yarvin
47a6b869a8 Almost there. 2014-10-25 05:21:48 -07:00
Ubuntu
b1ecf8882a hooked dill up to shell; removed batz 2014-10-22 02:59:05 +00:00
Ubuntu
fb67d37e2e added %time vane 2014-10-15 02:25:23 +00:00
C. Guy Yarvin
03c714afe5 Merge branch 'turbomem'
Conflicts:
	urb/urbit.pill
2014-07-31 13:38:05 -07:00
C. Guy Yarvin
46226c3dbf More memory pls. 2014-07-31 13:23:02 -07:00
C. Guy Yarvin
3378245281 Functional build skeleton. 2014-07-20 20:15:02 -07:00
C. Guy Yarvin
25ef176649 %gall now added to solid. 2014-05-28 15:06:52 -07:00
C. Guy Yarvin
0e296c73e2 Ford is integrated. 2014-05-09 10:18:23 -07:00
C. Guy Yarvin
b55b408937 Web shell stuff. 2014-04-16 12:47:41 -07:00
Christian Carter
4caa90c68f Cleaning up old code 2013-09-28 13:21:18 -07:00