13 Commits

Author	SHA1	Message	Date
Galen Wolfe-Pauly	46264b255d	minor talk fixes	2015-05-01 18:16:32 -07:00
Florian Steinel	c9b832d811	fix link to the guides	2015-05-01 15:18:01 +02: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	6457c00c28	comment out %camping	2015-04-30 15:58:39 -04:00
Anton Dyudin	8240fc7723	Merge branch 'test' of https://github.com/urbit/urbit into test	2015-04-30 12:49:17 -07:00
Anton Dyudin	7ebfeda9a5	fixed main/ imports to base/	2015-04-30 12:37:46 -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	75d4e2fbad	added %next clay subscription type	2015-04-29 21:23:46 -04:00
Philip C Monk	ed698889f6	Merge branch 'test' of https://github.com/urbit/urbit into test ... Conflicts: urb/urbit.pill	2015-04-29 19:03:59 -04:00
Philip C Monk	f03263852c	main->base, arvo events depth-first	2015-04-29 18:48:45 -04:00