Commit Graph

7 Commits

Author SHA1 Message Date
Anton Dyudin
77796a4fa6 Merge branch 'test' into do
Conflicts:
	urb/urbit.pill
	urb/zod/base/arvo/dill.hoon
	urb/zod/base/arvo/gall.hoon
2015-05-13 12:21:53 -07:00
Philip C Monk
4bc1fc316d forgot to commit the mass cat 2015-05-12 17:59:27 -04:00
C. Guy Yarvin
ea5ab48776 Various fixes and improvements. 2015-05-09 13:38:33 -07:00
Philip C Monk
38e20772a6 Merge branch 'master' of https://github.com/urbit/urbit 2015-04-30 17:09:18 -04:00
Philip C Monk
a672eb691e forgot to commit cat/helm/unix 2015-04-30 17:09:02 -04:00
Philip C Monk
b97b04a552 get rid of swapfile 2015-04-30 17:01:41 -04:00
Philip C Monk
f03263852c main->base, arvo events depth-first 2015-04-29 18:48:45 -04:00