Commit Graph

2049 Commits

Author SHA1 Message Date
cgyarvin
f31b460052 Merge pull request #413 from burtonsamograd/thread-nock-interpreter
Thread the nock interpreter using computed gotos.
2015-09-26 13:03:41 -07:00
Burton Samograd
31ff27f426 Bound check for bad nocks. 2015-09-26 13:18:15 -06:00
Burton Samograd
32da1b5f1a Thread the nock interpreter using computed gotos. 2015-09-25 23:38:52 -06:00
Philip C Monk
c75469040f Merge branch 'master' into test 2015-09-25 18:57:50 -04:00
Raymond Pasco
75e722e6d3 Merge remote-tracking branch 'daveloyall/patch-1' into test 2015-09-25 18:55:55 -04:00
Dave Loyall
f91e79d173 Remove bitrotten make target. 2015-09-25 17:54:50 -05:00
C. Guy Yarvin
19fb25de7f Merge branch 'master' of https://github.com/urbit/urbit 2015-09-24 16:34:17 -07:00
C. Guy Yarvin
ba11c0279d More ambiguous. 2015-09-24 16:34:01 -07:00
Philip C Monk
263fef4396 Merge branch 'bvschwartz-patch-1', remote-tracking branch 'anton/nobreach' into pending 2015-09-23 20:38:42 -04:00
Anton Dyudin
8e86d0a25a Merge remote-tracking branch 'urbit/master' into nobreach 2015-09-23 16:57:31 -07:00
Philip C Monk
ea2ef58f4e Merge remote-tracking branch 'anton/nobreach' into pending 2015-09-23 19:56:55 -04:00
Philip C Monk
8570983b63 Merge remote-tracking branch 'anton/nobreach' into pending 2015-09-23 19:41:14 -04:00
Philip C Monk
183700064d Merge remote-tracking branch 'anton/nobreach' into pending 2015-09-23 19:34:56 -04:00
Philip C Monk
54bdfd5d12 Merge remote-tracking branch 'anton/nobreach' into pending 2015-09-23 19:11:15 -04:00
Philip C Monk
9a3af59026 Merge remote-tracking branch 'anton/nobreach' into pending 2015-09-23 17:38:48 -04:00
Anton Dyudin
ee20e5670b Merge remote-tracking branch 'glen/test' into nobreach 2015-09-23 14:25:54 -07:00
C. Guy Yarvin
b9517c23b1 More negative. 2015-09-22 14:04:11 -07:00
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
Anton Dyudin
eb525b177d Merge branch 'master' of https://github.com/urbit/urbit into pittyp 2015-09-17 13:57:38 -07:00
Anton Dyudin
b4bc44ee1f Merge branch 'master' into pittyp 2015-09-17 13:56:00 -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