ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-16 19:22:22 +03:00
Code Issues Packages Projects Releases Wiki Activity
1,567 Commits 6 Branches 0 Tags 164 MiB
55e40f40e8
Commit Graph

1045 Commits

Author SHA1 Message Date
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
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
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
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
21034aa855 Various fixes, including timers 2014-08-01 10:54:31 -04:00
pcmonk
7d581a3714 most of new chat 2014-07-31 19:44:49 -07:00
Galen Wolfe-Pauly
8178c40b95 urb.js retooling 2014-07-31 16:57:35 -07:00
Galen Wolfe-Pauly
02f62ed48d Merge branch 'master' of https://github.com/urbit/urbit 2014-07-31 16:26:47 -07:00
C. Guy Yarvin
03c714afe5 Merge branch 'turbomem' 
Conflicts:
	urb/urbit.pill
 2014-07-31 13:38:05 -07:00
C. Guy Yarvin
06776448a0 Merge branch 'master' of github.com:urbit/urbit 
Conflicts:
	urb/urbit.pill
 2014-07-31 13:25:06 -07:00
C. Guy Yarvin
46226c3dbf More memory pls. 2014-07-31 13:23:02 -07:00
Jared Hance
2769378368 ++forge compiles 2014-07-31 16:17:37 -04:00
johncburnham
5fd348d1e9 roll protocol for breach 2014-07-31 08:25:29 -07:00
C. Guy Yarvin
f572cabe75 Clean up some markdown stuff. 2014-07-30 21:28:48 -07:00
C. Guy Yarvin
21691f4330 Fix structures in structures; str -> sur. 2014-07-30 15:56:56 -07:00
Jared Hance
c1a4aa7886 Merge branch 'master' into klay 
Conflicts:
	urb/urbit.pill
 2014-07-30 15:14:38 -04:00
Jared Hance
8f62bce5f4 Remove printfs 2014-07-30 15:09:59 -04:00
Jared Hance
968a002d68 Various fixes to make this thing usable 2014-07-30 14:56:51 -04:00
pcmonk
fb8bf21a2e Merge branch 'master' of https://github.com/urbit/urbit 2014-07-30 11:12:30 -07:00
pcmonk
46a27f53e6 %ford search in right place for protocols 2014-07-30 11:09:48 -07:00
C. Guy Yarvin
6febd493c3 Merge branch 'master' of github.com:urbit/urbit 
Conflicts:
	urb/zod/main/pro/down/core.hoon
 2014-07-30 10:53:58 -07:00
C. Guy Yarvin
0a01d489df Various fixes and improvements. 2014-07-30 10:53:30 -07:00
Jared Hance
9c20b7c2c1 Conflicts work 2014-07-30 13:42:48 -04:00
Jared Hance
c7a78be9bd Almost working 2014-07-30 13:04:40 -04:00
pcmonk
41d5757552 Merge branch 'master' into e2e-real 
Conflicts:
	urb/urbit.pill
	urb/zod/arvo/gall.hoon
	urb/zod/arvo/zuse.hoon
 2014-07-29 17:39:49 -07:00
pcmonk
1a2c960325 couple of %ford fixes 2014-07-29 16:29:56 -07:00
pcmonk
c5fe282e75 added %wipe to wipe app state 2014-07-29 15:44:41 -07:00
pcmonk
20da6ef2f1 fixed timeout crash with ++peek 2014-07-29 14:25:13 -07:00
Jared Hance
3e0b18494c Send original copy to merge 2014-07-29 14:16:35 -04:00
Jared Hance
68fb76214d Fix referential transparency in %merg 2014-07-29 13:43:20 -04:00
Jared Hance
ef94352267 Merge branch 'master' into klay 
Conflicts:
	urb/urbit.pill
 2014-07-29 13:25:18 -04:00
pcmonk
22dd323fbc Merge branch 'master' of https://github.com/urbit/urbit 
Conflicts:
	urb/urbit.pill
 2014-07-28 16:21:40 -07:00
pcmonk
d5eda8f962 fixed autoreload 2014-07-28 16:17:59 -07:00
C. Guy Yarvin
d145dd069a Merge branch 'master' of github.com:urbit/urbit 
Conflicts:
	urb/urbit.pill
 2014-07-28 15:54:58 -07:00
C. Guy Yarvin
009a767f52 FCGI pulls markdown. 2014-07-28 15:46:03 -07:00
pcmonk
c2bf2592c9 %eyre drops old subscribers even without ++pull 2014-07-28 13:23:26 -07:00
pcmonk
6d386f15cc give (slightly) more helpful crud errors in %gall 2014-07-28 12:23:51 -07:00
pcmonk
f34071c4ff e2e-acks in a consistent state, ready to merge 2014-07-28 11:44:56 -07:00
pcmonk
17592239e3 Merge branch 'master' into e2e-real 
Conflicts:
	urb/urbit.pill
 2014-07-28 10:56:39 -07:00
Jared Hance
dbb5995c9d Trivial fixes 2014-07-28 10:25:07 -04:00
C. Guy Yarvin
3c4696fefd More tweaking round the bleeding edges. 2014-07-27 05:04:30 -07:00
C. Guy Yarvin
c8399fdacf Moving toward new translation. 2014-07-27 03:26:17 -07:00
pcmonk
1445aefca4 Merge branch 'master' into e2e-real 
Conflicts:
	urb/urbit.pill
 2014-07-25 19:34:51 -07:00
pcmonk
2b4fec9a51 all (well-formed) test apps work 2014-07-25 19:10:24 -07:00
C. Guy Yarvin
a18ded751e Fix basic ford bugs. 2014-07-25 17:29:01 -07:00
Galen Wolfe-Pauly
d69390ff36 Merge branch 'master' of https://github.com/urbit/urbit 2014-07-25 12:11:06 -07:00
Galen Wolfe-Pauly
3d51055812 need data-scri in the head now 2014-07-25 12:11:01 -07:00
Jared Hance
3a48876a4d Fix referential transparency in %cu 2014-07-25 13:44:06 -04:00
C. Guy Yarvin
d8b3c5f7d5 Remove eyre console code to save memory. 2014-07-25 09:38:22 -07:00
C. Guy Yarvin
2f42a419ea Ford, with some comments to save memory. 2014-07-25 09:26:12 -07:00
Jared Hance
d71b5c6bc1 Functional neoclay 2014-07-25 11:38:13 -04:00
Jared Hance
873bd9b208 Simple change 2014-07-25 08:53:39 -04:00
C. Guy Yarvin
faf33d012b Ford compiles - still needs some syntax. 2014-07-24 13:29:16 -07:00
Jared Hance
bd3f0377b8 Fast-forward merges should work (untested) 2014-07-24 16:23:54 -04:00
Jared Hance
667ad45403 Semi-working merges. 2014-07-24 15:21:58 -04:00
C. Guy Yarvin
f9e53c2541 Merge branch 'master' of github.com:urbit/urbit 2014-07-24 11:16:50 -07:00
C. Guy Yarvin
96e2eef2b2 Fix some indents. 2014-07-24 11:16:39 -07:00
Jared Hance
9eea495578 Zuse compiles w/ some merge code. 2014-07-24 12:13:36 -04:00
Jared Hance
bb18c8b086 Unix sync out. 2014-07-24 11:47:11 -04:00
Jared Hance
fb24594e9e Can boot subs now! 2014-07-24 11:11:40 -04:00
pcmonk
2b9b533a6f work on making end-to-end acks work 2014-07-23 19:02:50 -07:00
C. Guy Yarvin
20c5c1d5a0 Code complete on ford. 2014-07-23 16:23:53 -07:00
Anton Dyudin
7e50755029 Restructured raws/rads:og for =^ result order, added /=pals= %ames .^ 2014-07-23 14:01:52 -07:00
pcmonk
13a4df24a1 cleanup 2014-07-23 11:25:53 -07:00
C. Guy Yarvin
7051a7f711 Merge branch 'master' of github.com:urbit/urbit 2014-07-23 11:17:55 -07:00
C. Guy Yarvin
271e4f2c0e Remove XX. 2014-07-23 11:17:43 -07:00
johncburnham
424fa7398d once more into the breach 2014-07-23 01:31:09 -07:00
johncburnham
58921e9fd4 xml parser II: the richard donner cut 2014-07-22 16:12:38 -07:00
johncburnham
9d4302698d Revert "fixed minor bug in xml parser" 
This reverts commit 908d8d5fde6f03e41adb10bc8163e5cc2c0dc285.
 2014-07-22 15:59:43 -07:00
Jared Hance
38122c5b5a Fix merge... 2014-07-22 15:33:17 -04:00
Jared Hance
27f38c45bd Merge branch 'master' into klay 
Conflicts:
	urb/zod/arvo/zuse.hoon
 2014-07-22 15:03:59 -04:00
johncburnham
6bb974f2ec fixed minor bug in xml parser 2014-07-22 12:02:44 -07:00
Jared Hance
5ba302978c Broken. 2014-07-22 14:56:04 -04:00
Jared Hance
36549106ae zuse compiles again... 2014-07-22 10:11:03 -04:00
Jared Hance
4e6e0e79eb Add +-got to ++by. 2014-07-22 10:10:01 -04:00
C. Guy Yarvin
edfae53ddc Fix horrid indentation thing. 2014-07-22 09:32:35 -07:00
C. Guy Yarvin
5d8bca3bea Some hoof tweaks. 2014-07-21 18:55:40 -07:00
C. Guy Yarvin
9c39abae1c Merge branch 'master' of github.com:urbit/urbit 
Conflicts:
	urb/urbit.pill
 2014-07-21 15:54:29 -07:00
C. Guy Yarvin
2b5e57de2d Replace ++logo with ++mark to match doc. 2014-07-21 15:14:52 -07:00
Anton Dyudin
847253d685 fixed %eyre urb.user inject 2014-07-21 13:38:46 -07:00
C. Guy Yarvin
3378245281 Functional build skeleton. 2014-07-20 20:15:02 -07:00
C. Guy Yarvin
ac488f6225 We are very close to the memory limit on :solid! 2014-07-18 19:45:10 -07:00
C. Guy Yarvin
925ae8ccb7 Merge branch 'master' of github.com:urbit/urbit 2014-07-18 17:51:37 -07:00
C. Guy Yarvin
79b91ebd7a New ford skeleton; some hoon cleanups 2014-07-18 17:51:22 -07:00
pcmonk
372ece59d3 unsubscriptions through %eyre 2014-07-18 12:23:35 -07:00
pcmonk
dd7400682b Merge branch 'eyre-stuff' 
Conflicts:
	urb/urbit.pill
 2014-07-17 16:16:28 -07:00
pcmonk
895b4a8f84 clients divorced from apps, streams multiplexed 2014-07-17 16:11:00 -07:00
C. Guy Yarvin
2260d31b1c Merge branch 'master' of github.com:urbit/urbit 2014-07-17 13:56:22 -07:00
C. Guy Yarvin
f3e3eb01e0 Preparing to integrate new ford. 2014-07-17 13:56:08 -07:00
Jared Hance
f82578e30d Add useful stuff 2014-07-17 16:04:18 -04:00
Jared Hance
1933149d04 Zuse compiles again, new model. 2014-07-17 14:27:14 -04:00
Jared Hance
2bcde8f6ee Initial klay stuff. 
Clay.hoon doesn't work yet, haven't done subscriptions.

Should probably changes yakis to only reference yaki mugs rather than
yakis themselves - and have a blob map in the dome. Otherwise
subscriptions and merges will suck for large stuff.
 2014-07-17 11:40:52 -04:00
johncburnham
5987ff2f8d improved xml parser 2014-07-16 19:46:46 -07:00
pcmonk
20574f69f7 more work on eyre-stuff -- compiles 2014-07-16 19:10:13 -07:00
C. Guy Yarvin
b9b6d522b9 Merge branch 'master' of github.com:urbit/urbit 
Conflicts:
	urb/urbit.pill
 2014-07-16 11:56:15 -07:00
C. Guy Yarvin
5b8844207e Minor tweaks. 2014-07-16 11:54:53 -07:00
pcmonk
2df55edb87 Bump protocol number 2014-07-16 11:25:22 -07:00
Jared Hance
3c85c88040 Merge branch 'clay' 
Conflicts:
	urb/urbit.pill
 2014-07-16 13:56:34 -04:00
johncburnham
bbe73c468f added an xml parser 2014-07-15 22:47:43 -07:00
pcmonk
3fafa64ed5 initial work on eyre changes 2014-07-15 19:30:29 -07:00
Anton Dyudin
ecb2ebf79b zl:jo no longer builds faceless poles 2014-07-15 16:07:39 -07:00
pcmonk
92f7bddcd8 unkludged eyre heartbeat 2014-07-14 19:45:04 -07:00
Jared Hance
e086185603 Add ++reap. 
Makes constructing lists for testing alot nicer.
 2014-07-14 11:59:16 -04:00
C. Guy Yarvin
ff5e56a05c Move silks around, etc. 2014-07-12 11:24:52 -07:00
pcmonk
f20944f107 Finished heartbeat 2014-07-11 19:02:11 -07:00
pcmonk
5acce9cc04 checkpoint 2014-07-11 16:44:33 -07:00
Jared Hance
58e1f03655 Ugly ++lize stuff. 
Well, merges work better, two-way parties seem fine with merging back
and forth.
 2014-07-11 14:05:07 -04:00
pcmonk
d20aee378b initial work on eyre heartbeat 2014-07-10 19:40:58 -07:00
C. Guy Yarvin
efde5692ed Fix some path reversal bugs. 2014-07-10 16:13:42 -07:00
Jared Hance
8e5c44a628 Update mergepoints. 2014-07-10 16:54:28 -04:00
pcmonk
9ec4de8d6b %lean is gone, long live %mean 2014-07-10 13:10:41 -07:00
Jared Hance
057ff37574 Clay revision control basically works. 
Just need to update the agons, coming soon.
 2014-07-10 16:07:48 -04:00
Jared Hance
7eb4282f33 Finish ++alne. 2014-07-10 15:24:22 -04:00
Jared Hance
d9782a5b5f Merges work again. 2014-07-10 15:13:42 -04:00
pcmonk
2f2112f153 bump protocol number for breach 2014-07-10 11:21:49 -07:00
Jared Hance
8c7281a330 Modify the data flow in zuse. 
Gets the ++niku passed around everywhere, so we have enough information
to actually merge.
 2014-07-10 10:45:17 -04:00
Jared Hance
07998df9e1 Add ++niku to ++saba. 2014-07-10 10:38:53 -04:00
Jared Hance
d549b6a4fe Fix revision origin. 2014-07-10 10:24:29 -04:00
C. Guy Yarvin
606dc97887 Merge branch 'master' of github.com:urbit/urbit 2014-07-09 18:39:19 -07:00
C. Guy Yarvin
2c53cdb8cb Fix a very eyre bug. 2014-07-09 18:39:01 -07:00
johncburnham
4c2cb96dae Small improvement to error messages in browser 2014-07-09 18:37:44 -07:00
C. Guy Yarvin
a608e99ce0 Various fixes and improvements. 2014-07-09 17:48:53 -07:00
C. Guy Yarvin
27bf640e79 Merge branch 'master' of github.com:urbit/urbit 
Conflicts:
	urb/urbit.pill
 2014-07-09 17:17:07 -07:00
C. Guy Yarvin
0d91fcb76a Changes to ++sill. 2014-07-09 17:16:17 -07:00
C. Guy Yarvin
56a8799501 Various fixes and improvements. 2014-07-09 16:12:26 -07:00
pcmonk
0966b543c8 Merge branch 'master' of https://github.com/urbit/urbit 
Conflicts:
	urb/urbit.pill
 2014-07-09 14:44:54 -07:00
C. Guy Yarvin
720ca0a14f Various fixes and improvements. 2014-07-09 14:43:30 -07:00
pcmonk
2c15e0c0bf %send effect does not need to drop through anymore 2014-07-09 14:42:08 -07:00
Jared Hance
235583e858 Almost there... 2014-07-09 16:56:23 -04:00
Jared Hance
8703188407 Restructure clay. 
Hopefully this is the only commit that would require a breach.

Writing a data transition would be trivial later.

Still need to fix ++domo.
 2014-07-09 15:11:25 -04:00
C. Guy Yarvin
5496fe9e79 Fix FCGI cache handling. 2014-07-09 02:40:49 -07:00
C. Guy Yarvin
2d9e4e4a29 Merge branch 'master' of github.com:urbit/urbit 
Conflicts:
	urb/urbit.pill
 2014-07-09 00:40:19 -07:00
C. Guy Yarvin
f9236fe2c8 Various fixes and improvements. 2014-07-09 00:37:47 -07:00
C. Guy Yarvin
8296c6189d Fix FCGI suffix. 2014-07-08 20:24:40 -07:00
pcmonk
2e230304fc Fixed lag bug 2014-07-08 20:20:38 -07:00
C. Guy Yarvin
95eb7baca5 Various fixes and improvements. 2014-07-08 20:00:30 -07:00
C. Guy Yarvin
acbb821155 Fix basic functional publishing. 2014-07-08 15:46:34 -07:00
C. Guy Yarvin
46c9731e21 A bunch of translators. 2014-07-08 15:12:42 -07:00
pcmonk
90f915752d Bump protocol number 2014-07-08 12:51:24 -07:00
C. Guy Yarvin
fee2d7011e Merge branch 'master' of github.com:urbit/urbit 
Conflicts:
	urb/urbit.pill
 2014-07-08 12:07:38 -07:00
C. Guy Yarvin
6337290934 Fix json reparser. 2014-07-08 11:38:07 -07:00
Jared Hance
0becefd519 Small change. 
Not sure why I had troubles doing this before. Probably didn't change
%+  to  %-  or something.
 2014-07-08 14:07:14 -04:00
Jared Hance
56b590f5e6 Rewrite ++urle. 
In theory this is an optimization...
 2014-07-08 14:07:14 -04:00
C. Guy Yarvin
ffad1ede43 Merge branch 'master' of github.com:urbit/urbit 
Conflicts:
	urb/urbit.pill
 2014-07-07 23:19:18 -07:00
C. Guy Yarvin
b67420b10f Merge branch 'master' of github.com:urbit/urbit 
Conflicts:
	urb/urbit.pill
 2014-07-07 23:16:17 -07:00
pcmonk
a55d4d1413 fixed %nice, %mean over %ames 2014-07-07 17:32:58 -07:00
pcmonk
b2f5a36cae Merge branch 'temp' 
Conflicts:
	urb/urbit.pill
 2014-07-07 16:56:44 -07:00
pcmonk
ce2a89fdd2 partial switch away from %rasp 2014-07-07 16:36:35 -07:00
C. Guy Yarvin
6e1acf52fe Fix some ford and md bugs. 2014-07-07 16:17:21 -07:00
Jared Hance
239ed25154 Some cleanup in ++auld. 2014-07-07 16:11:40 -04:00
pcmonk
996ed44e9d bug fix in %gall 2014-07-07 10:58:15 -07:00
Jared Hance
c787b33b8e More ++doze in %clay changes... 
Still trying to figure out the %clay model.
 2014-07-07 10:59:11 -04:00
Jared Hance
1242d1b456 Rewrite ++doze in %clay. 
I'm always a fan of removing ugly names just for a single call.
 2014-07-07 10:29:47 -04:00
C. Guy Yarvin
4387713100 Eliminate old XML abbreviations. 2014-07-06 15:16:20 -07:00
C. Guy Yarvin
e35426a8f5 Eliminate superfluous |* in funpub. 2014-07-06 09:57:37 -07:00
C. Guy Yarvin
e473ab7cf4 Fix functional publishing and add debug feedback. 2014-07-05 16:38:15 -07:00
C. Guy Yarvin
b0f6e59f66 Merge branch 'master' of github.com:urbit/urbit 2014-07-05 14:27:08 -07:00
C. Guy Yarvin
35b48e0cb9 Various fixes and improvements. 2014-07-05 14:26:35 -07:00
Anton Dyudin
b44c6ff94c ++inde indented block combinator no longer produces optimistic hair 2014-07-05 14:02:52 -07:00
C. Guy Yarvin
f9f5f7c29d Merge branch 'master' of github.com:urbit/urbit 
Conflicts:
	urb/urbit.pill
 2014-07-03 13:06:52 -07:00
Jared Hance
e96868996b Rewrite ++lode and ++wode 
Total lines added/deleted for patch.
 2014-07-03 15:50:55 -04:00
Jared Hance
49364e07ce Rewrite ++lith. 2014-07-03 15:32:10 -04:00
Jared Hance
787bdae914 Document ++lisp. 
Merge of woof and urge.
 2014-07-03 15:27:43 -04:00
pcmonk
24fb18fe73 Merge branch 'master' of https://github.com/urbit/urbit 
Conflicts:
	urb/urbit.pill
 2014-07-03 11:17:57 -07:00
pcmonk
40329afb12 improved chat 2014-07-03 11:14:22 -07:00
Jared Hance
1f5ca20c6e Revive ++ja. 2014-07-03 14:07:21 -04:00
Jared Hance
408529e7f3 Rewrite ++lyre (miso commute with woof) 2014-07-03 12:41:37 -04:00
Jared Hance
af077d1c23 Rewrite ++alto. 
Most of the first part of ++ze is now clean and understood.
 2014-07-03 12:05:41 -04:00
Jared Hance
4748aa2df2 Rewrite ++alda and ++alot. 2014-07-03 11:46:26 -04:00
Jared Hance
bbcaf18703 Various fixes and improvements. 2014-07-03 11:35:17 -04:00
C. Guy Yarvin
f86e80187a Fix json reparser. 2014-07-02 19:56:33 -07:00
pcmonk
f0d41ea9d6 progress in chat, added reverse of sup.hid 2014-07-02 18:53:53 -07:00
pcmonk
04afbdc6c9 %gall over %ames works 2014-07-02 16:24:03 -07:00
pcmonk
ea49cdca02 progress on %gall over %ames 2014-07-02 15:08:02 -07:00
Jared Hance
06c0b54d1b Various fixes and improvements. 
++murn is better.

++zing now works like ++welp.
 2014-07-02 15:44:37 -04:00
Jared Hance
38ce666012 Add ++murn. 
Maybe turn
 2014-07-02 11:11:23 -04:00
Anton Dyudin
1fc8f3d104 Merge branch 'master' of https://github.com/urbit/urbit 2014-07-01 16:30:30 -07:00
C. Guy Yarvin
37f933b33a Change ++ja to ++jo and fix some stuff. 2014-07-01 16:29:44 -07:00
Anton Dyudin
4751de0d5f Merge branch 'master' of https://github.com/urbit/urbit 2014-07-01 15:51:47 -07:00
Anton Dyudin
afa76048e0 comment fixes 2014-07-01 15:51:42 -07:00
C. Guy Yarvin
7f2a8deb61 Merge branch 'master' of github.com:urbit/urbit 2014-07-01 13:35:36 -07:00
C. Guy Yarvin
a857ff6445 Merge branch 'master' of github.com:urbit/urbit 
Conflicts:
	urb/urbit.pill
 2014-07-01 13:34:06 -07:00
Jared Hance
119841460f Add a bit of info to ++unce. 2014-07-01 14:33:27 -04:00
Anton Dyudin
20d14296c0 Moar indentation 2014-06-30 19:28:47 -07:00