urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-18 07:42:20 +03:00
Code Issues Packages Projects Releases Wiki Activity
1,878 Commits 768 Branches 10 Tags 215 MiB
6a4188db3a
Commit Graph

1878 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Philip C Monk
6a4188db3a Merge remote-tracking branches 'anton/nobreach' and 'my/clayhammer' into test 
Conflicts:
	urb/urbit.pill
 2015-09-21 14:58:10 -04:00
Raymond Pasco
d3a475e800 Merge remote-tracking branch 'gunga/skid-jet' into test 2015-09-19 15:41:37 -04:00
Joan Torres
012dabaf6a Add ++skid jet 2015-09-19 10:03:13 -07:00
Philip C Monk
696a20505f Merge remote-tracking branch 'my/pending' into test 2015-09-17 16:55:57 -04:00
Philip C Monk
ca7b72a7cf Merge remote-tracking branch 'anton/nobreach' into pending 2015-09-17 16:54:33 -04:00
Philip C Monk
b77e4c8ab7 Merge remote-tracking branch 'my/pending' into test 
Conflicts:
	urb/urbit.pill
 2015-09-17 14:51:01 -04:00
Philip C Monk
05390c8cd0 Merge remote-tracking branches 'anton/nobreach' and 'galen/test' into pending 2015-09-17 14:36:41 -04:00
Anton Dyudin
0f067191b2 Merge branch 'master' into nobreach 2015-09-17 11:34:38 -07:00
Raymond Pasco
48e997f0fc Merge remote-tracking branch 'gunga/reap-jet' into test 2015-09-16 17:01:25 -04:00
Joan Torres
dfc529f274 Add ++reap jet 2015-09-16 13:50:36 -07:00
Philip C Monk
2845ca6229 Merge branch 'master' into clayhammer 2015-09-15 19:16:09 -04:00
Raymond Pasco
ffaede9239 Merge branch 'murn-jet' into test 
Closes #402
 2015-09-15 14:05:16 -04:00
Joan Torres
70b9e5d9c2 Add ++murn jet 2015-09-15 13:59:00 -04:00
Raymond Pasco
b9c11bdb29 Forwardport branch 'readme-fix' into test 2015-09-15 02:38:00 -04:00
Raymond Pasco
cdb13294ee Merge branch 'readme-fix' 2015-09-15 02:34:40 -04:00
Raymond Pasco
dc357ac25a update begin syntax in readme 2015-09-15 02:13:50 -04:00
Philip C Monk
c24a7b44a4 Merge branch 'pending' into test 2015-09-11 20:47:43 -04:00
Philip C Monk
62a0802adf Merge remote-tracking branch 'anton/nobreach' into pending 2015-09-11 20:39:24 -04:00
Philip C Monk
357a6e72b0 Merge branch 'pending' into test 2015-09-11 17:19:16 -04:00
Philip C Monk
ac12d4fea3 Merge branch 'workfix' into test 
Conflicts:
	urb/zod/ape/dojo.hoon
 2015-09-11 15:15:11 -04:00
Galen Wolfe-Pauly
213e1f727c Merge branch 'test' of github.com:urbit/urbit into test 2015-09-10 21:26:58 -07:00
Galen Wolfe-Pauly
701841f057 Merge branch 'test' of github.com:galenwp/urbit into test 2015-09-10 19:35:55 -07:00
Philip C Monk
b9bad5c1c9 Merge branch 'clayhammer' 2015-09-10 18:39:00 -04:00
Raymond Pasco
99b1a4ef44 Merge branch 'yebyen-patchset' into test 2015-09-10 18:00:37 -04:00
Raymond Pasco
e71fbfad04 Merge branch 'yebyen-patchset' 
Closes #400
 2015-09-10 17:59:15 -04:00
Kingdon
2bb098c1ed patchset 2015-09-10 17:56:02 -04:00
Philip C Monk
7b52cb9c16 Merge branch 'master' into test 2015-09-10 14:39:24 -04:00
Philip C Monk
60079d7676 Merge remote-tracking branch 'origin/pending' 2015-09-10 14:35:43 -04:00
Philip C Monk
cff2c91273 Merge remote-tracking branch 'origin/pending' 2015-09-10 14:00:14 -04:00
Anton Dyudin
dd71add6c3 Merge branch 'pending' of https://github.com/urbit/urbit into pending 2015-09-10 10:28:03 -07:00
Raymond Pasco
6dd1f8c5d9 Merge remote-tracking branch 'yebyen/master' into test 2015-09-10 07:10:36 -04:00
Raymond Pasco
2771404e2f Merge remote-tracking branch 'yebyen/master' into pending 2015-09-10 07:10:12 -04:00
Raymond Pasco
f61cdb9925 Merge remote-tracking branch 'yebyen/master' 2015-09-10 07:08:37 -04:00
Kingdon
f0d6f92584 update reference 2015-09-10 00:56:13 -04:00
Anton Dyudin
116d64753e Merge branch 'nobreach' into pending 2015-09-09 18:15:04 -07:00
Anton Dyudin
1094ec0540 Merge branch 'nobreach' into pending 2015-09-09 16:54:34 -07:00
Anton Dyudin
4e91dd1a7d Merge branch 'pending' into nobreach 2015-09-09 16:53:46 -07:00
Anton Dyudin
dec6320b82 newline on bail 2015-09-09 16:52:53 -07:00
Philip C Monk
cd73e722fd Merge branch 'pending' 2015-09-09 19:17:40 -04:00
Philip C Monk
5bdd1e4503 Merge branch 'clayhammer' into pending 
Conflicts:
	urb/urbit.pill
	urb/zod/ape/dojo.hoon
	urb/zod/arvo/zuse.hoon
	urb/zod/lib/drum.hoon
	urb/zod/lib/helm.hoon
	urb/zod/lib/kiln.hoon

Also bumped protocol to 4
 2015-09-09 19:15:26 -04:00
Philip C Monk
ba407c6d37 Merge branch 'master' into pending 2015-09-09 17:32:49 -04:00
Philip C Monk
57ebf20b44 Merge remote-tracking branch 'origin/test' into pending 2015-09-09 17:32:02 -04:00
Anton Dyudin
2b8b5872d7 Merge branch 'nobreach' into pending 2015-09-09 14:20:39 -07:00
Anton Dyudin
bdfe82f9a9 Merge branch 'pending' into test 2015-09-08 13:28:15 -07:00
vere
2f4da4c827 Merge branch 'pending' of https://github.com/urbit/urbit into pending 2015-09-08 19:24:45 +00:00
Raymond Pasco
cad8b3b20d Merge remote-tracking branch 'chc4/socket' into test 2015-09-04 22:12:53 -04:00
Charlie Cummings
98760f8e38 hide libuv socket errors 2015-09-04 18:49:09 -04:00
Philip C Monk
a8d59bf7a3 performance improvements 2015-09-03 17:14:35 -04:00
Galen Wolfe-Pauly
2c593d4aac Merge branch 'apps' into pending 2015-09-02 16:43:22 -07:00
Galen Wolfe-Pauly
1b05fe430c Merge branch 'apps' into pending 2015-09-02 16:41:38 -07:00