19 Commits

Author	SHA1	Message	Date
Anton Dyudin	1515de98c3	changed to :bit+send 0cADDRESS 'BTC-amount'	2015-05-20 12:17:52 -07:00
Anton Dyudin	ab078ee41a	Merge branch 'test' into do ... Conflicts: urb/urbit.pill urb/zod/base/arvo/ -- took --theirs urb/zod/base/fap/talk/core.hook	2015-05-20 11:45:37 -07:00
Philip C Monk	2f34a2eeff	added the :+mass cat	2015-05-19 14:28:41 -04:00
C. Guy Yarvin	fcc44754c9	Merge branch 'master' into livetest ... Conflicts: urb/urbit.pill urb/zod/base/arvo/dill.hoon urb/zod/base/arvo/gall.hoon	2015-05-18 12:43:11 -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
Henry Ault	3884808c55	Merge remote-tracking branch 'origin/master' into do	2015-05-12 15:59:28 -07:00
Philip C Monk	4bc1fc316d	forgot to commit the mass cat	2015-05-12 17:59:27 -04:00
C. Guy Yarvin	1f2ed6ae76	Merge old helm code into hood/kiln.	2015-05-11 17:31:37 -07:00
C. Guy Yarvin	ea5ab48776	Various fixes and improvements.	2015-05-09 13:38:33 -07:00
henry	799baff5a5	Various fixes and improvements -- bit	2015-05-07 19:27:50 -04:00
Henry Ault	c77662a009	Merge branch 'do' of http://github.com/urbit/urbit into do ... Conflicts: urb/zod/base/app/bit/core.hook	2015-05-07 02:51:55 -04:00
Henry Ault	478d210298	ported to real network	2015-05-07 02:49:30 -04:00
Henry Ault	999ca3535b	publisher update	2015-05-06 19:29:56 -07:00
Henry Ault	b543549d28	moved main to base	2015-05-06 14:08:27 -07:00
Anton Dyudin	ede9f1e89e	restored :hi	2015-05-04 11:10:02 -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