Commit Graph

63 Commits

Author SHA1 Message Date
Anton Dyudin
b72da57ce8 Merge branch 'space-tools' into test
Conflicts:
	urb/urbit.pill
	urb/zod/base/arvo/time.hoon
2015-05-07 10:30:32 -07:00
Henry Ault
478d210298 ported to real network 2015-05-07 02:49:30 -04:00
C. Guy Yarvin
54165e49b8 Merge branch 'master' into test
Conflicts:
	urb/urbit.pill
2015-05-06 19:13:15 -07:00
Kingdon
f1533c8972 necessary 2015-05-06 21:53:05 -04:00
Galen Wolfe-Pauly
70cb0566d8 minor 2015-05-06 18:24:43 -07:00
Galen Wolfe-Pauly
b3e4633e1f new look 2015-05-06 18:01:36 -07:00
Henry Ault
b543549d28 moved main to base 2015-05-06 14:08:27 -07:00
Galen Wolfe-Pauly
5b7e4120b0 minor doc css 2015-05-04 18:05:13 -07:00
Galen Wolfe-Pauly
46264b255d minor talk fixes 2015-05-01 18:16:32 -07:00
Galen Wolfe-Pauly
276b8fc416 minor talk fixes 2015-05-01 18:06:28 -07:00
Florian Steinel
c9b832d811 fix link to the guides 2015-05-01 15:18:01 +02:00
Anton Dyudin
7ebfeda9a5 fixed main/ imports to base/ 2015-04-30 12:37:46 -07:00
Philip C Monk
f03263852c main->base, arvo events depth-first 2015-04-29 18:48:45 -04:00