70 Commits

Author	SHA1	Message	Date
Anton Dyudin	f39de10190	Merge remote-tracking branch 'origin/test' into do	2015-05-13 16:12:58 -07:00
Philip C Monk	6cb1505288	fixed merges	2015-05-13 17:18:43 -04:00
Anton Dyudin	5d252b315e	Merge branch 'test' into do	2015-05-13 12:46:39 -07:00
Anton Dyudin	a8578d4ed2	port1	2015-05-13 12:46:25 -07:00
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
C. Guy Yarvin	2b940d9346	Various fixes and improvements; test can :?begin.	2015-05-13 01:02:34 -07:00
C. Guy Yarvin	6dcbda8df4	Merge branch 'test' of https://github.com/urbit/urbit into test ... Conflicts: urb/urbit.pill urb/zod/base/ape/helm/core.hook	2015-05-12 13:36:21 -07:00
C. Guy Yarvin	5665fb132a	Various cleanups.	2015-05-12 13:10:22 -07:00
Anton Dyudin	fdbf46ce16	added json octo interfaces	2015-05-12 12:57:58 -07:00
Anton Dyudin	23939c6dfd	Merge branch 'test' of https://github.com/urbit/urbit into test	2015-05-11 17:51:00 -07:00
Anton Dyudin	5d718597c5	sole transmute fix	2015-05-11 17:50:40 -07:00
C. Guy Yarvin	1f2ed6ae76	Merge old helm code into hood/kiln.	2015-05-11 17:31:37 -07:00
C. Guy Yarvin	66f7b16d5e	Various fixes and improvements.	2015-05-11 10:53:47 -07:00
Henry Ault	4c117a9418	merge test	2015-05-07 14:34:49 -07:00
C. Guy Yarvin	61610b4669	Revert to less broken console library.	2015-05-06 19:18:06 -07:00
Henry Ault	b543549d28	moved main to base	2015-05-06 14:08:27 -07:00
Anton Dyudin	8eba67cf03	norm mark beaks	2015-04-30 17:34:57 -07:00
Philip C Monk	d30dfc5270	bumped protocol number to 3	2015-04-30 14:52:51 -04:00
Philip C Monk	fb74e61885	moved ford dependencies to new model	2015-04-30 14:37:22 -04:00
Philip C Monk	f03263852c	main->base, arvo events depth-first	2015-04-29 18:48:45 -04:00