Commit Graph

1011 Commits

Author SHA1 Message Date
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
Ubuntu
fb62c395ec Merge branch 'test' of https://github.com/urbit/urbit into test 2014-08-26 17:25:57 +00:00
Ubuntu
9ecfd2156a removed 'make' on distclean 2014-08-26 17:25:29 +00:00
johncburnham
2541655515 Merge branch 'test' of https://github.com/urbit/urbit into test 2014-08-26 10:19:33 -07:00
Ubuntu
fd8aaa4ce3 Merge https://github.com/tjic/urbit_with_libuv11_characteristics into test 2014-08-26 17:02:48 +00:00
TJIC
fd1daf5f36 cleanup of libuv Make rules for Phillip integration to test 2014-08-26 12:58:46 -04:00
C. Guy Yarvin
3ff6a88ca6 Various fixes and improvements. 2014-08-26 09:12:45 -07:00
ault011
f37ff56d2b Merge branch 'test' of https://github.com/urbit/urbit into test 2014-08-25 19:33:20 -07:00
Ubuntu
81af9fa15d Merge branch 'master' into test 2014-08-25 21:48:59 +00:00
Ubuntu
c0eaa09c29 patched makefile 2014-08-25 21:48:23 +00:00
C. Guy Yarvin
af5352fc1a Incorporate HAMT into meme.c; delete old BPT. 2014-08-25 14:35:37 -07:00
Ubuntu
60b4a0ce3e adding libuv's libtool files 2014-08-25 21:21:42 +00:00
Ubuntu
1524495582 Merge https://github.com/tjic/urbit_with_libuv11_characteristics 2014-08-25 21:20:30 +00:00
TJIC
5c403f1066 better error message when two copies of vere running 2014-08-25 17:17:50 -04:00
TJIC
269fa55ab2 better error message when two copies of vere running 2014-08-25 17:16:16 -04:00
TJIC
ef71cb8280 configure as needed 2014-08-25 16:57:13 -04:00
Ubuntu
9a68a111bf Merge https://github.com/tjic/urbit_with_libuv11_characteristics 2014-08-25 17:54:51 +00:00
Ubuntu
a9f945e271 Merge branch 'master' into test
Conflicts:
	urb/urbit.pill
2014-08-25 15:09:50 +00:00
C. Guy Yarvin
66bd19ed0a Various fixes and improvements. 2014-08-25 02:58:38 -04:00
TJIC
5afb8e1c3b renamed outside/libuv dir 2014-08-22 17:39:35 -04:00
TJIC
4b717e8e95 renamed 2014-08-22 17:39:21 -04:00
TJIC
bcc5879c80 renamed 2014-08-22 17:39:01 -04:00
TJIC
12175c11d2 removed old libuv 2014-08-22 17:35:35 -04:00
TJIC
a1bc6dcbf8 libuv 0.11 working 2014-08-22 17:33:27 -04:00
TJIC
bdde790446 reverted to -O2 2014-08-22 17:33:15 -04:00
TJIC
341fb08c52 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-22 12:19:02 -04:00
C. Guy Yarvin
a5a89eb3eb No longer used. 2014-08-22 11:46:19 -04:00