Commit Graph

1468 Commits

Author SHA1 Message Date
Ubuntu
c3d15a202e Merge https://github.com/tjic/urbit_with_libuv11_characteristics into test
Conflicts:
	Makefile
2014-08-27 18:22:34 +00:00
ault011
d6aefb1cc2 Merge branch 'test' of https://github.com/urbit/urbit into test 2014-08-26 19:00:56 -07:00
ault011
10c80387da WIP single-file site 2014-08-26 19:00:09 -07:00
Ubuntu
351b148714 Merge branch 'test' of https://github.com/urbit/urbit into test 2014-08-27 01:45:48 +00:00
Ubuntu
5c107029f6 almost done with lifecycle of a packet 2014-08-27 01:45:26 +00:00
johncburnham
a41bdf7ad2 Update syntax.md 2014-08-26 14:11:07 -07:00
johncburnham
59413d6773 Update phonology.md 2014-08-26 13:39:52 -07:00
johncburnham
8092089048 Update morphology.md 2014-08-26 13:02:22 -07:00
johncburnham
b7bdbf83e0 Update index.md 2014-08-26 12:59:32 -07:00
Ubuntu
3afd35241a fixed ++mur 2014-08-26 19:49:31 +00:00
C. Guy Yarvin
09887e99ff Merge branch 'test' of github.com:urbit/urbit into test 2014-08-26 12:12:17 -07:00
C. Guy Yarvin
06fb497dca Add MurmurHash3. 2014-08-26 12:11:59 -07:00
ault011
7314f2e651 deleted last paragraph 2014-08-26 11:56:32 -07:00
ault011
2f6d286c55 Merge branch 'test' of https://github.com/urbit/urbit into test 2014-08-26 11:54:10 -07:00
ault011
d9a60b2bdb backstep addition 2014-08-26 11:53:42 -07:00
Ubuntu
5df088c79a Merge branch 'test' of https://github.com/urbit/urbit into test 2014-08-26 17:25:57 +00:00
johncburnham
32982c1837 rename syntax.md 2014-08-26 10:21:22 -07:00
johncburnham
cdaff6b551 Merge branch 'test' of https://github.com/urbit/urbit into test 2014-08-26 10:19:33 -07:00
johncburnham
a8931ecb19 Some more doc 2014-08-26 10:19:08 -07:00
Ubuntu
93f62a4243 Merge https://github.com/tjic/urbit_with_libuv11_characteristics into test 2014-08-26 17:02:48 +00:00
ault011
68545f2851 Merge branch 'test' of https://github.com/urbit/urbit into test 2014-08-25 19:33:20 -07:00
ault011
69c2318bea Push 2014-08-25 19:33:05 -07:00
Ubuntu
b180f779ea Merge branch 'master' into test 2014-08-25 21:48:59 +00:00
Ubuntu
6871584f5b Merge https://github.com/tjic/urbit_with_libuv11_characteristics 2014-08-25 21:20:30 +00:00
Ubuntu
9b56c28f61 Merge https://github.com/tjic/urbit_with_libuv11_characteristics 2014-08-25 17:54:51 +00:00
Ubuntu
ad098e276b updated %ames doc 2014-08-25 17:10:13 +00:00
Ubuntu
ee80bb021f Merge branch 'master' into test
Conflicts:
	urb/urbit.pill
2014-08-25 15:09:50 +00:00
Anton Dyudin
f7be77e81b All ++norm:vast arms commented 2014-08-24 21:20:32 -07:00
vere
5b9fd272c6 bump protocol number 2014-08-24 22:13:27 +00:00
Anton Dyudin
dc78296507 Moar ++norm comments 2014-08-23 19:20:02 -07:00
Anton Dyudin
3a043c3604 Merge branch 'test' of https://github.com/urbit/urbit into test 2014-08-23 15:56:50 -07:00
Anton Dyudin
13dfbc804f Rescued urbit.org markdown 2014-08-23 15:56:35 -07:00
Ubuntu
aa14348312 Merge branch 'test' of https://github.com/urbit/urbit into test 2014-08-23 02:42:28 +00:00
Ubuntu
9200bcb02d updated %ames doc 2014-08-23 02:42:18 +00:00
Anton Dyudin
b7270db63a Merge branch 'test' of https://github.com/urbit/urbit into test 2014-08-22 18:38:33 -07:00
Anton Dyudin
b28000dd01 ++vast comments 2014-08-22 18:38:20 -07:00
Ubuntu
ef682f2aca updated morphology doc 2014-08-22 23:13:55 +00:00
Ubuntu
e2d856f202 updated morphology doc 2014-08-22 21:14:04 +00:00
TJIC
b9ebee4449 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-22 12:19:02 -04:00
Ubuntu
b84867eb66 a little more %ames doc 2014-08-22 03:07:10 +00:00
johncburnham
f1ae7e4594 Merge branch 'test' of https://github.com/urbit/urbit into test 2014-08-21 14:18:03 -07:00
johncburnham
5222da66ad added some extremely rough hoon reference 2014-08-21 14:09:52 -07:00
Ubuntu
554a22660b Merge branch 'master' into test
Conflicts:
	urb/urbit.pill
2014-08-21 20:08:32 +00:00
ault011
b32aa3064f Merge branch 'master' of https://github.com/urbit/urbit 2014-08-21 13:01:28 -07:00
ault011
0317c0f1b1 Restructured the directory format for doc/ref/vol 2014-08-21 13:00:19 -07:00
Anton Dyudin
2dfa8b8b91 twit unmurder 2014-08-21 12:44:55 -07:00
Anton Dyudin
3d454f2acf Am I doing this right? 2014-08-21 12:15:05 -07:00
TJIC
58699ca7a0 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-21 10:18:30 -04:00
johncburnham
d408ebc495 breach protocol roll 2014-08-21 06:08:56 -07:00
Ubuntu
87f8bc901f Merge branch 'test' of https://github.com/urbit/urbit into test 2014-08-21 03:25:12 +00:00