Commit Graph

22 Commits

Author SHA1 Message Date
Galen Wolfe-Pauly
9b69907bfa demo network 2015-05-31 12:07:42 -07:00
C. Guy Yarvin
b2b762589a Merge branch 'livetest'
Conflicts:
	urb/urbit.pill
2015-05-18 13:02:17 -07:00
C. Guy Yarvin
cf6962abad New protocol 7 for breach. 2015-05-18 12:51:33 -07: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
C. Guy Yarvin
9a60d48e21 Various fixes and improvements. 2015-05-14 16:27:45 -07:00
C. Guy Yarvin
cc2a7defb5 Various fixes and improvements. 2015-05-13 16:31:13 -07:00
C. Guy Yarvin
2b940d9346 Various fixes and improvements; test can :?begin. 2015-05-13 01:02:34 -07:00
Philip C Monk
7f7512e3dc bump to protocol 6 2015-05-12 17:31:25 -04:00
Philip C Monk
b2eddf4f83 Merge remote-tracking branch 'origin/master' into space-tools
Conflicts:
	urb/urbit.pill
2015-05-12 17:24:24 -04:00
Philip C Monk
d43169dc17 reworked ++mass 2015-05-12 17:18:34 -04:00
C. Guy Yarvin
5665fb132a Various cleanups. 2015-05-12 13:10:22 -07:00
C. Guy Yarvin
9e84fca27e Fix %mack. 2015-05-11 11:16:04 -07:00
C. Guy Yarvin
b3027a328b And %gall is reborn. 2015-05-09 15:55:05 -07:00
Anton Dyudin
60eb11a0f7 fix ames begin to talk to gall 2015-05-07 14:17:39 -07:00
Anton Dyudin
b8c3720c28 continuity roll 5 2015-05-07 10:36:29 -07:00
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
Philip C Monk
98801c4a14 added space profiling tools 2015-05-06 22:25:41 -04:00
C. Guy Yarvin
54165e49b8 Merge branch 'master' into test
Conflicts:
	urb/urbit.pill
2015-05-06 19:13:15 -07:00
C. Guy Yarvin
2af8dd2263 Hand-merge ames and time from newgall. 2015-05-06 19:00:58 -07:00
C. Guy Yarvin
acce20899f Continuity breach with new protocol 4. 2015-05-03 16:57:35 -07:00
Philip C Monk
d30dfc5270 bumped protocol number to 3 2015-04-30 14:52:51 -04:00
Philip C Monk
f03263852c main->base, arvo events depth-first 2015-04-29 18:48:45 -04:00