Commit Graph

987 Commits

Author SHA1 Message Date
C. Guy Yarvin
a71a657680 compiles and links. 2014-09-10 17:01:32 -07:00
C. Guy Yarvin
57278a5a1d More renaming. 2014-09-10 09:45:39 -07:00
C. Guy Yarvin
464f545e99 Merge branch 'test' into memorable
Conflicts:
	Makefile
	gen164/watt.c
2014-09-10 09:06:30 -07:00
C. Guy Yarvin
d9ddc38de2 About to merge in test. 2014-09-09 09:44:08 -07:00
C. Guy Yarvin
ad871a1639 q but not w. 2014-09-08 21:42:55 -07:00
C. Guy Yarvin
df6bbc8fc4 Compatible with k.164. 2014-09-08 19:35:25 -07:00
C. Guy Yarvin
7b4782053b Various fixes. 2014-09-06 23:11:09 -07:00
C. Guy Yarvin
1d1d4fc309 Testing properly. 2014-09-06 21:24:18 -07:00
C. Guy Yarvin
785f25d7a9 Jets almost loads. 2014-09-06 17:09:29 -07:00
C. Guy Yarvin
af5128c851 Closer to running a jet. 2014-09-06 15:39:28 -07:00
C. Guy Yarvin
464940e765 Merge branch 'test' of git://github.com/urbit/urbit-new into test 2014-09-06 14:09:33 -07:00
C. Guy Yarvin
2578107992 With a simple dashboard. 2014-09-06 13:39:13 -07:00
C. Guy Yarvin
7cfdd36fab Change u2 to u3. 2014-09-05 13:13:24 -07:00
C. Guy Yarvin
f0d6edce20 A bunch of restructuring. 2014-09-05 12:55:16 -07:00
Ubuntu
63353684c8 Merge branch 'master' into test
Conflicts:
	urb/urbit.pill
2014-09-05 16:22:22 +00:00
C. Guy Yarvin
ad19b035d0 Merge branch 'test' of git://github.com/urbit/urbit-new into test
Conflicts:
	urb/urbit.pill
2014-09-04 17:25:08 -07:00
C. Guy Yarvin
14c22cf9da Yes. 2014-09-04 10:03:38 -07:00
C. Guy Yarvin
68715087b2 More reorgs. 2014-09-03 20:44:53 -07:00
C. Guy Yarvin
2cc897c410 Last remains of old jet mangling. 2014-09-03 20:10:43 -07:00
C. Guy Yarvin
6fa6b15cb8 More renaming, etc. 2014-09-03 19:28:15 -07:00
C. Guy Yarvin
bd6bfa1fad Finish renaming etc. 2014-09-03 14:33:18 -07:00
Ubuntu
b833113e48 Merge branch 'test' of https://github.com/urbit/urbit into test
Conflicts:
	urb/urbit.pill
2014-09-03 20:04:27 +00:00
Galen Wolfe-Pauly
4e037f134e Merge branch 'test' of github.com:urbit/urbit-new into test 2014-09-03 10:52:27 -07:00
Anton Dyudin
6cfd2d3219 Merge branch 'test' of https://github.com/urbit/urbit into test 2014-09-03 00:20:19 -07:00
C. Guy Yarvin
6d52238ac1 Considerable refactorings. 2014-09-02 22:46:55 -07:00
C. Guy Yarvin
b4ce2f98f5 Update cq names. 2014-09-02 20:36:29 -07:00
C. Guy Yarvin
2d9af9f04e Before jet renaming. 2014-09-02 19:58:36 -07:00
johncburnham
c5c2019e6f Merge branch 'test' of https://github.com/urbit/urbit into test
Conflicts:
	urb/urbit.pill
	urb/zod/arvo/hoon.hoon
2014-09-02 17:15:20 -07:00
C. Guy Yarvin
b75189b53e Pull in murmur3. 2014-09-02 13:45:49 -07:00
C. Guy Yarvin
dee4429462 Merge branch 'test' of git://github.com/urbit/urbit-new into test 2014-09-02 13:13:36 -07:00
C. Guy Yarvin
882e8e226b Ready to switch over mug. 2014-09-02 13:13:12 -07:00
C. Guy Yarvin
0504873d42 Better to commit than stash. 2014-09-02 11:21:38 -07:00
johncburnham
cb713c65bf Merge branch 'test' of https://github.com/urbit/urbit into test 2014-09-02 00:04:53 -07:00
Ubuntu
47463e0cd5 Merge branch 'master' into test 2014-09-02 00:47:05 +00:00
C. Guy Yarvin
a6ea515d2a Jet dispatcher compiles and links. 2014-09-01 17:10:04 -07:00
Ubuntu
cce7efd0b6 Merge branch 'master' into test
Conflicts:
	urb/urbit.pill
2014-09-01 17:43:49 +00:00
C. Guy Yarvin
d7018b3310 Various fixes and improvements. 2014-08-28 12:40:40 -07:00
Ubuntu
431cdee1e8 Merge branch 'master' into test
Conflicts:
	urb/urbit.pill
2014-08-28 17:20:02 +00:00
Ubuntu
86ff25423d Merge branch 'test' of https://github.com/urbit/urbit into test 2014-08-27 21:59:38 +00:00
Anton Dyudin
10d5eafb25 make зашибись 2014-08-27 14:42:33 -07:00
Ubuntu
e27b2657a5 Merge https://github.com/tjic/urbit_with_libuv11_characteristics into test
Conflicts:
	Makefile
2014-08-27 18:22:34 +00:00
TJIC
e1a4bb7a20 it should be possible to type 'make distclean all' 2014-08-27 14:14:08 -04:00
ault011
0891bea8b0 Merge branch 'test' of https://github.com/urbit/urbit into test 2014-08-26 19:00:56 -07:00
ault011
9d55744f75 WIP single-file site 2014-08-26 19:00:09 -07:00
Ubuntu
8160f931ea fixed ++mur 2014-08-26 19:49:31 +00:00
TJIC
0cec1c1d22 removed debugging printf 2014-08-26 15:16:10 -04:00
C. Guy Yarvin
a432bfbcf2 Merge branch 'test' of github.com:urbit/urbit into test 2014-08-26 12:12:17 -07:00
C. Guy Yarvin
e75d2e70b2 Add MurmurHash3. 2014-08-26 12:11:59 -07:00
ault011
b9b3d8e017 Merge branch 'test' of https://github.com/urbit/urbit into test 2014-08-26 11:54:10 -07:00
Ubuntu
f23100ccc6 update dependency list in readme 2014-08-26 17:31:38 +00:00