ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-15 01:52:42 +03:00
Code Issues Packages Projects Releases Wiki Activity
1,591 Commits 6 Branches 0 Tags 164 MiB
5525f22c1c
Commit Graph

1591 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
C. Guy Yarvin
5b16f99726 Latest greatest scriptest. 2015-05-19 21:07:53 -07:00
Anton Dyudin
fe550a766e Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-19 20:31:32 -07:00
C. Guy Yarvin
8964da0c8b Check in demo instructions. 2015-05-19 19:38:03 -07:00
C. Guy Yarvin
d11dced141 Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-19 17:04:23 -07:00
C. Guy Yarvin
9bfc5674c3 Enable -q. 2015-05-19 17:04:08 -07:00
Galen Wolfe-Pauly
7405dd3323 Merge branch 'test' of github.com:urbit/urbit into test 2015-05-19 16:54:41 -07:00
Galen Wolfe-Pauly
ce2cc29d13 Merge branch 'test' of github.com:urbit/urbit into test 2015-05-19 16:22:58 -07:00
Galen Wolfe-Pauly
fcb29827c0 Merge branch 'test' of github.com:urbit/urbit into test 2015-05-19 16:13:27 -07:00
C. Guy Yarvin
1d5aefe142 Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-19 16:10:44 -07:00
Philip C Monk
9e2f7eddc2 Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-19 18:43:34 -04:00
Philip C Monk
384ab7b37e add (disabled) bad event ignore 2015-05-19 18:43:12 -04:00
Galen Wolfe-Pauly
2767bce602 Merge branch 'master' into test 
Conflicts:
	urb/urbit.pill
	urb/zod/base/arvo/eyre.hoon
 2015-05-19 15:42:49 -07:00
Philip C Monk
6bc9ccc648 new pill 2015-05-19 18:14:35 -04:00
Philip C Monk
93cda96190 Merge branch 'time-tools' 2015-05-19 18:08:15 -04:00
Philip C Monk
f014ecdac0 Merge branch 'master' into time-tools 
Conflicts:
	urb/urbit.pill
 2015-05-19 18:07:54 -04:00
C. Guy Yarvin
b41780b3c3 Merge remote-tracking branch 'urban/hugeicon' into demo 2015-05-19 14:14:51 -07:00
Galen Wolfe-Pauly
a21434974a Merge branch 'master' of github.com:urbit/urbit 2015-05-19 13:26:18 -07:00
vere
af2d572171 Merge branch 'master' of https://github.com/urbit/urbit 2015-05-19 20:00:37 +00:00
Galen Wolfe-Pauly
d21f21fcfa Merge branch 'master' of github.com:urbit/urbit 2015-05-19 12:07:43 -07:00
C. Guy Yarvin
225d211f01 You can now start with -v. 2015-05-19 11:56:44 -07:00
Galen Wolfe-Pauly
4144b7dea7 Merge branch 'master' of github.com:urbit/urbit 2015-05-19 11:55:01 -07:00
C. Guy Yarvin
5f6e3522ff Merge branch 'master' of https://github.com/urbit/urbit 
Conflicts:
	urb/urbit.pill
 2015-05-19 11:46:46 -07:00
C. Guy Yarvin
ad47ebec56 -T for autoboot. 2015-05-19 11:38:23 -07:00
vere
213e207e20 Merge branch 'master' of https://github.com/urbit/urbit 2015-05-19 17:49:18 +00:00
Galen Wolfe-Pauly
ed608b6d1b Merge branch 'master' into test 
Conflicts:
	urb/urbit.pill
 2015-05-19 10:17:37 -07:00
Galen Wolfe-Pauly
588d257778 solided 2015-05-19 10:12:36 -07:00
vere
5ca233a73c Merge branch 'master' of https://github.com/urbit/urbit 2015-05-18 21:35:59 +00:00
Philip Monk
d3fd096231 Merge pull request #282 from othercriteria/chatless 
Removing chat clutter
 2015-05-18 13:49:04 -07:00
C. Guy Yarvin
d31186b021 Revert dual network. 2015-05-18 13:14:27 -07:00
C. Guy Yarvin
74ea159ccb Merge branch 'livetest' 
Conflicts:
	urb/urbit.pill
 2015-05-18 13:02:17 -07:00
C. Guy Yarvin
90dbe458f3 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
7181d26ca8 Merge branch 'test' into livetest 
Conflicts:
	urb/urbit.pill
 2015-05-18 12:24:58 -07:00
C. Guy Yarvin
8caac67e05 Eliminated last direct pointers from piers. 2015-05-18 10:07:42 -07:00
C. Guy Yarvin
2b861da97c drum in hood works, modulo slow update bug. 2015-05-16 17:31:28 -07:00
C. Guy Yarvin
a7970bebee Merge branch 'test' into livetest 
Conflicts:
	urb/urbit.pill
	urb/zod/base/ape/hood/core.hook
	urb/zod/base/arvo/dill.hoon
 2015-05-15 13:34:41 -07:00
Philip C Monk
2fc873f37e jetted ++scag 2015-05-14 20:39:27 -04:00
Henry Ault
3847c64f47 Merge branch 'master' of https://github.com/urbit/urbit into do 2015-05-14 15:20:56 -04:00
Anton Dyudin
e9aa8aeb80 Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-14 11:04:49 -07:00
Philip C Monk
c1261be063 temporarily changed ~zod's address 2015-05-14 13:49:22 -04:00
C. Guy Yarvin
d2633b152c Merge branch 'test' of https://github.com/urbit/urbit into test 
Conflicts:
	urb/urbit.pill
 2015-05-13 17:15:06 -07:00
Philip C Monk
7641dfad01 fix profiling on linux 2015-05-13 19:48:29 -04:00
Galen Wolfe-Pauly
ae6ef34d89 Merge branch 'test' of github.com:urbit/urbit into test 2015-05-13 16:22:03 -07:00
Anton Dyudin
1991ed6f07 Merge remote-tracking branch 'origin/test' into do 2015-05-13 16:12:58 -07:00
Philip C Monk
9b9fe1bfb4 plug memoization leak 2015-05-13 18:23:20 -04:00
Philip C Monk
ff4e20d63f fixed merges 2015-05-13 17:18:43 -04:00
Anton Dyudin
9a625bdc5b Merge branch 'test' into do 2015-05-13 12:46:39 -07:00
Anton Dyudin
580077e725 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
vere
18080ab9bd Merge branch 'master' of https://github.com/urbit/urbit 2015-05-13 00:12:18 +00:00
vere
816205e708 split out road memory data 2015-05-13 00:11:11 +00:00
Philip Monk
82ed68f2d1 Merge pull request #280 from chc4/master 
Awesome, thanks so much!
 2015-05-12 16:47:38 -07:00