Commit Graph

6 Commits

Author SHA1 Message Date
C. Guy Yarvin
8c0e89949b Stage down to 163. 2015-01-26 16:25:27 -08:00
C. Guy Yarvin
335cb42764 Fix bad merge. 2015-01-26 09:44:09 -08:00
Anton Dyudin
c9caa1538e Merge branch 'exec' into test
Conflicts:
	urb/zod/main/app/shell/core.hook
	urb/zod/main/app/terminal/core.hook
2015-01-25 21:29:21 -08:00
C. Guy Yarvin
920754ad61 Various fixes and improvements. 2015-01-25 17:38:03 -08:00
C. Guy Yarvin
dac4ea96db Merge branch 'test' of https://github.com/urbit/urbit into test
Conflicts:
	urb/urbit.pill
2015-01-22 14:01:39 -08:00
C. Guy Yarvin
6dfd825b9c Rename radio to rodeo. 2015-01-15 11:32:04 -08:00