Commit Graph

1535 Commits

Author SHA1 Message Date
Anton Dyudin
b7694eef35 Added basic vol1 usage references 2014-08-04 14:05:28 -07:00
ault011
e12edc40c3 deleted wrong copy 2014-08-04 13:32:04 -07:00
ault011
7a828f0821 Deleted swap 2014-08-04 13:31:44 -07:00
ault011
d309d1cac7 changes to 9, 10 2014-08-04 13:24:30 -07:00
Galen Wolfe-Pauly
feee558c08 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-04 13:22:08 -07:00
C. Guy Yarvin
a4a3c67664 Protocol to 2. 2014-08-04 12:51:34 -07:00
Galen Wolfe-Pauly
257d240523 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-04 12:50:37 -07:00
Galen Wolfe-Pauly
89778db699 cb obj 2014-08-04 12:44:27 -07:00
C. Guy Yarvin
16bba2613c Merge branch 'master' of github.com:urbit/urbit 2014-08-04 12:40:52 -07:00
C. Guy Yarvin
bac72d4277 Delete annpying ringtf. 2014-08-04 12:40:40 -07:00
ault011
5f7483226b Nock 9, 10 2014-08-04 12:40:00 -07:00
Galen Wolfe-Pauly
68238ba57e Merge branch 'master' of https://github.com/urbit/urbit 2014-08-04 12:38:02 -07:00
Galen Wolfe-Pauly
f00f19bc58 better eyre subscriptions 2014-08-04 12:37:43 -07:00
ault011
ea79e990ba Merge branch 'master' of https://github.com/urbit/urbit 2014-08-04 12:05:40 -07:00
ault011
b4a4df7c9b nock 9, 10 2014-08-04 12:05:11 -07:00
johncburnham
7f3a5b9efc some doc work 2014-08-04 11:59:31 -07:00
C. Guy Yarvin
e772988cae Moving to protocol 1. 2014-08-04 10:46:37 -07:00
C. Guy Yarvin
02494787db New urbit.pill. 2014-08-04 10:32:48 -07:00
johncburnham
e2118154a2 Merge branch 'master' of https://github.com/urbit/urbit
Conflicts:
	urb/zod/arvo/ames.hoon
2014-08-04 10:19:56 -07:00
johncburnham
86e0312934 bad commit 2014-08-04 10:18:58 -07:00
C. Guy Yarvin
d08bf31fc0 A great renaming, and other works. 2014-08-04 10:18:26 -07:00
johncburnham
4e925fa53d git dropped a commit? 2014-08-04 09:54:14 -07:00
Galen Wolfe-Pauly
6852cdec5b Merge branch 'urbjs' 2014-08-03 12:04:55 -07:00
Galen Wolfe-Pauly
98a1d2cce5 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-03 12:04:19 -07:00
C. Guy Yarvin
2908e8aafa Rename pro to mac. 2014-08-02 17:37:36 -07:00
C. Guy Yarvin
d3e3c826b4 Turn off !: to clear some memory room. Grrr... 2014-08-02 16:55:56 -07:00
C. Guy Yarvin
b4b28aa094 Merge branch 'master' of github.com:urbit/urbit 2014-08-02 16:40:49 -07:00
C. Guy Yarvin
d52646f14b Various fixes, renamings, and improvements. 2014-08-02 16:33:22 -07:00
pcmonk
1cb4bb27cb drop redundant acks instead of crashing 2014-08-01 19:04:50 -07:00
johncburnham
6da42a48a4 the markdown parser mysteriously broke 2014-08-01 18:05:54 -07:00
pcmonk
b7f2e2bc79 Merge branch 'master' into klay
Conflicts:
	urb/urbit.pill
2014-08-01 16:53:42 -07:00
pcmonk
a70b13bae5 Merge branch 'master' into e2e-real
Conflicts:
	urb/urbit.pill
2014-08-01 16:46:00 -07:00
pcmonk
eb414be4fa fixed structures 2014-08-01 16:41:46 -07:00
C. Guy Yarvin
3009394270 Merge branch 'master' of github.com:urbit/urbit 2014-08-01 16:39:30 -07:00
C. Guy Yarvin
e97b3c08a5 Various fixes and improvements. 2014-08-01 16:39:15 -07:00
pcmonk
97755be677 Merge branch 'master' into e2e-real
Conflicts:
	urb/urbit.pill
2014-08-01 16:27:44 -07:00
pcmonk
fe828ce29c chat is working 2014-08-01 16:17:24 -07:00
johncburnham
51af8cc7c5 swap files bad 2014-08-01 14:22:31 -07:00
johncburnham
b6b8ca70b2 but actually 2014-08-01 14:16:38 -07:00
johncburnham
737afa1c3c sane doc structure 2014-08-01 14:14:23 -07:00
ault011
d98be5839d added split volumes of "doc-split-me" 2014-08-01 12:51:30 -07:00
Galen Wolfe-Pauly
500acfb39f fixed subs 2014-08-01 11:21:28 -07:00
Jared Hance
4e9d9b44cf Add zapcols 2014-08-01 14:11:46 -04:00
Jared Hance
537e2695ff Merge branch 'master' into klay
Conflicts:
	urb/urbit.pill
	urb/zod/arvo/zuse.hoon
2014-08-01 14:02:51 -04:00
Jared Hance
83e0291f99 256 bit hashes for objects... 2014-08-01 12:40:19 -04:00
Jared Hance
e48181b23e Optimize merge ancestor location 2014-08-01 12:21:26 -04:00
Jared Hance
0512cc6d47 Optimize ++zerg for common case 2014-08-01 11:45:29 -04:00
Jared Hance
a0fedff20c Trivial fixes 2014-08-01 11:35:56 -04:00
Jared Hance
aaeaa07a04 Better :show 2014-08-01 11:34:42 -04:00
Jared Hance
21034aa855 Various fixes, including timers 2014-08-01 10:54:31 -04:00