Commit Graph

1356 Commits

Author SHA1 Message Date
Anton Dyudin
9ccc1ab038 And by 0 we mean 1 2014-11-09 09:38:15 -08:00
Anton Dyudin
446ab0d8aa Roll protocol 0 2014-11-09 08:35:16 -08:00
C. Guy Yarvin
b54934353f Some jael work. 2014-11-08 02:08:29 -08:00
Philip C Monk
f44d1590be fixed gall bug 2014-11-06 20:22:23 -05:00
Philip C Monk
ace87f20f4 Merge remote-tracking branch 'origin/test' into dish
Conflicts:
	i/v/vere.h
2014-11-06 17:04:57 -05:00
Philip C Monk
55fa6d0408 added different password prompt mode 2014-11-05 17:40:18 -05:00
Philip C Monk
c8f5313407 Merge branch 'dish' of https://github.com/urbit/urbit into dish 2014-11-05 14:44:54 -05:00
Philip C Monk
36ef1778ca fixed some ordering issues 2014-11-05 14:39:00 -05:00
Philip C Monk
c6f86e7b6a Merge branch 'test' into dish
Conflicts:
	include/v/vere.h
	urb/urbit.pill
	urb/zod/arvo/ames.hoon
	urb/zod/arvo/hoon.hoon
	v/loop.c
	v/raft.c
2014-11-04 16:42:02 -05:00
Anton Dyudin
a6ae36ee89 XML printer escapes things again 2014-11-04 13:21:51 -08:00
Anton Dyudin
ff277e356e Merge branch 'shell' of https://github.com/urbit/urbit into shell 2014-11-04 12:32:59 -08:00
Anton Dyudin
6f6930e7af URL parser restructure 2014-11-04 12:32:09 -08:00
Philip C Monk
703be48ef3 Merge branch 'test' into shell
Conflicts:
	urb/urbit.pill
2014-11-04 15:30:16 -05:00
Philip C Monk
5242925469 Merge branch 'test' into shell
Conflicts:
	include/v/vere.h
	urb/urbit.pill
	urb/zod/arvo/clay.hoon
	urb/zod/arvo/eyre.hoon
	urb/zod/arvo/hoon.hoon
	urb/zod/main/mar/hook/door.hook
	urb/zod/main/mar/psal/door.hook
	urb/zod/main/mar/txt/door.hook
	urb/zod/main/pub/src/doc/ref/vol/1.md
	v/loop.c
	v/raft.c
	v/reck.c
	v/unix.c
2014-11-04 15:22:33 -05:00
C. Guy Yarvin
1a290c720c Fix a ++ap bug. 2014-11-04 12:20:44 -08:00
C. Guy Yarvin
ab64c9493f All pointers now eradicated. 2014-11-04 10:39:56 -08:00
C. Guy Yarvin
013edce53c Make it boot on linux. 2014-11-03 15:07:46 -08:00
Anton Dyudin
9de72b30ca Fixed earn not escaping query string 2014-11-03 00:28:58 -08:00
Anton Dyudin
1dd447001b Restructured earn 2014-11-03 00:05:07 -08:00
Anton Dyudin
bb65c8d467 Fixed ++sifo 2014-11-02 23:49:09 -08:00
Anton Dyudin
ca1aa94523 Removed pre-ford http handling 2014-11-02 23:27:52 -08:00
C. Guy Yarvin
d707ae35ea Merge branch 'test' into memorable
Conflicts:
	urb/urbit.pill
	urb/zod/arvo/hoon.hoon
	urb/zod/arvo/zuse.hoon
	urb/zod/main/pub/src/doc/ref/vol/4c.md
	v/reck.c
2014-11-02 02:03:13 -08:00
C. Guy Yarvin
21b6d4ec43 Various fixes and improvements. 2014-11-01 15:13:18 -07:00
Anton Dyudin
69b63718cb Restructured deft, added /foo/'tape?'/baz path form 2014-10-31 16:45:09 -07:00
C. Guy Yarvin
4f29307601 Various fixes and improvements. 2014-10-31 15:36:01 -07:00
Anton Dyudin
71add7cd31 Repaired vestigal $_en 2014-10-31 11:29:28 -07:00
Philip C Monk
34bd31893d Merge remote-tracking branch 'origin/shell' into dish
Conflicts:
	urb/urbit.pill
	urb/zod/main/app/shell/core.hook
2014-10-31 13:56:33 -04:00
Anton Dyudin
f6e6620514 Removed $_ bunt meaning 2014-10-30 20:13:40 -07:00
C. Guy Yarvin
a05fe50498 Fix lth bug. :-) 2014-10-30 17:30:19 -07:00
Philip C Monk
5d40a20598 Merge remote-tracking branch 'origin/shell' into dish
Conflicts:
	urb/urbit.pill
	urb/zod/arvo/hoon.hoon
	urb/zod/main/app/terminal/hymn/script.js
2014-10-30 16:48:18 -04:00
Anton Dyudin
080512a129 Refactored xml* to poxo and poxa 2014-10-30 13:33:15 -07:00
Philip C Monk
1fbd634ff4 added :ticket 2014-10-29 20:37:17 -04:00
Anton Dyudin
acd39e4b73 Comments, moved ++fain to URL 2014-10-29 17:09:03 -07:00
Anton Dyudin
396c38300b Zuse restructure 2014-10-29 16:30:15 -07:00
Ubuntu
b2c2ae3374 :begin working except unix sync 2014-10-29 23:07:13 +00:00
Anton Dyudin
2c3bf7b0ee XML refactoring 2014-10-29 15:50:57 -07:00
Anton Dyudin
13f71f1e46 Comments, JSON refactoring, ++flit $+(_,? $+(* (unit))) 2014-10-29 13:59:01 -07:00
Anton Dyudin
a0786715a5 Type tightening 2014-10-28 18:31:16 -07:00
Anton Dyudin
18c0f91a5e Twitter psals, rash poja/xmlp, di:jo millisecond unix date 2014-10-28 16:13:02 -07:00
Anton Dyudin
d38388449c Fixed spud to use separate code 2014-10-28 13:26:54 -07:00
Anton Dyudin
0e988b588d Removed tyq:ag 2014-10-28 13:15:44 -07:00
Ubuntu
e12a41c08e autosync/unsync works 2014-10-28 19:59:26 +00:00
Anton Dyudin
5798c490b1 Moved spat/spud/stab, refactored json 2014-10-28 11:55:44 -07:00
Ubuntu
fa0aac2a5c Merge branch 'dish' of https://github.com/urbit/urbit into dish 2014-10-28 01:50:50 +00:00
Ubuntu
8f1bf03d50 autosync seems to be working 2014-10-28 01:50:07 +00:00
Steven Dee
b998134a86 Renew ~tyr's papacy 2014-10-27 18:13:56 -04:00
Anton Dyudin
b26deda123 Removed 2eF comments 2014-10-27 15:12:02 -07:00
Anton Dyudin
7365daef84 Regex refactoring 2014-10-26 19:29:32 -07:00
Anton Dyudin
b27098ab6c rege refactoring 2014-10-26 16:16:07 -07:00
C. Guy Yarvin
ca945b0cbb Various fixes and improvements. 2014-10-25 14:28:14 -07:00
C. Guy Yarvin
47a6b869a8 Almost there. 2014-10-25 05:21:48 -07:00
Anton Dyudin
22feaa507a Term-line restructure: (list ?(tank [%stem tank tank])) 2014-10-24 12:58:04 -07:00
C. Guy Yarvin
a6783e6f43 New cold jet storage. 2014-10-23 17:35:26 -07:00
Anton Dyudin
23b57f3b27 Further disarming 2014-10-23 17:21:28 -07:00
Anton Dyudin
609566117e Arm removal with prejudice 2014-10-23 16:29:33 -07:00
Ubuntu
35e5688b70 added kill and :verb 2014-10-23 22:56:06 +00:00
Ubuntu
c94b900977 auto-convert from json to mark 2014-10-23 21:09:39 +00:00
Anton Dyudin
73db5c6c6b Merge branch 'dish' of https://github.com/urbit/urbit into dish 2014-10-23 14:08:30 -07:00
Ubuntu
8840aa0d51 Merge branch 'dish' of https://github.com/urbit/urbit into dish 2014-10-23 21:11:32 +00:00
Ubuntu
c9d0ec374a Merge branch 'shell' into dish
Conflicts:
	urb/urbit.pill
2014-10-23 21:11:10 +00:00
Anton Dyudin
4ff6716381 wick/woad comment 2014-10-23 14:08:11 -07:00
Anton Dyudin
9dc3e1be70 Comment ++runt 2014-10-23 12:59:15 -07:00
Ubuntu
0a2c2938e4 Merge branch 'shell' into dish
Conflicts:
	urb/urbit.pill
2014-10-23 03:20:13 +00:00
Ubuntu
c363149abe Merge branch 'shell' of https://github.com/urbit/urbit into shell
Conflicts:
	urb/urbit.pill
2014-10-23 03:17:03 +00:00
Ubuntu
6fda6d75f1 have eyre convert to json 2014-10-23 03:13:10 +00:00
Ubuntu
2d6377f530 Merge branch 'shell' into dish
Conflicts:
	urb/urbit.pill
2014-10-23 03:08:22 +00:00
Anton Dyudin
33fcc09519 Path refactoring 2014-10-22 14:49:47 -07:00
Ubuntu
6326d25140 cleaned up terminal code 2014-10-22 19:13:07 +00:00
Ubuntu
b1ecf8882a hooked dill up to shell; removed batz 2014-10-22 02:59:05 +00:00
Anton Dyudin
e7ea40dd79 h/h refactoring 2014-10-21 19:04:27 -07:00
C. Guy Yarvin
642b267072 Add hoon jet management code. 2014-10-21 13:53:27 -07:00
Anton Dyudin
ed13febe1b Comments 2014-10-20 15:18:01 -07:00
Anton Dyudin
a0d2c80364 Fixed ++qu 2014-10-20 12:47:08 -07:00
C. Guy Yarvin
966ce01bc8 New jet dashboard noun. 2014-10-19 16:47:49 -07:00
Ubuntu
c0769ca2ea removed clay timer from unix.c 2014-10-16 22:54:01 +00:00
Ubuntu
246d259f0d Merge branch 'shell' of https://github.com/urbit/urbit into shell 2014-10-16 21:16:15 +00:00
Anton Dyudin
07d4d4bd1a Revert "Updated ++stir to roll interface"
This reverts commit 5a31374a1b05d000ba2c983fe1f53676b50fbc08.
2014-10-16 14:12:16 -07:00
Ubuntu
656bce55a3 weaned clay off its own timer 2014-10-16 20:42:45 +00:00
Galen Wolfe-Pauly
b4f6e6920f Fixed %eyre nyp in epic 2014-10-16 12:53:38 -07:00
Anton Dyudin
6f4939dee8 Updated ++stir to roll interface 2014-10-15 18:07:21 -07:00
vere
404aa55a71 bump to protocol 7 2014-10-16 01:06:38 +00:00
Ubuntu
dc13ba6fb9 cleaned up timer vane 2014-10-15 22:47:53 +00:00
Ubuntu
93e6ea7fb8 eyre heartbeat uses timer vane 2014-10-15 22:05:48 +00:00
Ubuntu
53b5c04ac3 allow removing timers 2014-10-15 19:58:06 +00:00
Ubuntu
3447af7a22 Merge branch 'shell' of https://github.com/urbit/urbit into shell
Conflicts:
	urb/urbit.pill
2014-10-15 02:28:46 +00:00
Ubuntu
fb67d37e2e added %time vane 2014-10-15 02:25:23 +00:00
Ubuntu
c0ed7eda0f fixed ford/gall mysteries 2014-10-15 02:23:07 +00:00
Anton Dyudin
ccd3c7e07e Fixed ++reap product type 2014-10-13 17:48:22 -07:00
Anton Dyudin
10b8baf609 Fixed ^:tyl/pax irregular form
Conflicts:
	urb/urbit.pill
2014-10-13 15:02:24 -07:00
vere
3fe2ec6b2d bump to protocol 6 2014-10-13 19:07:42 +00:00
Anton Dyudin
9b6ad8967c UTF-8 inject 2014-10-10 16:52:20 -07:00
Anton Dyudin
355c7c122d Minor restructuring 2014-10-10 16:34:29 -07:00
Anton Dyudin
0e95d953e8 Guarded JSON parse errors 2014-10-10 15:17:28 -07:00
Anton Dyudin
05a39ac52f Tank hax! 2014-10-10 14:16:19 -07:00
Anton Dyudin
aafa48f300 Protocol roll 5 2014-10-09 16:26:10 -07:00
Anton Dyudin
886b68b55c Propogated %ford heels
Conflicts:
	urb/zod/main/mar/psal/door.hook
2014-10-09 12:41:19 -07:00
Anton Dyudin
b60bef4ce4 Propogated %ford heels 2014-10-09 12:38:55 -07:00
C. Guy Yarvin
701487936d Now boots and runs a clean :solid. 2014-10-08 15:16:24 -07:00
Anton Dyudin
64738ba280 Normalized noun:grab:[mark] clams 2014-10-08 12:06:40 -07:00
Ubuntu
3f3e8b2e79 more printfs 2014-10-08 01:00:55 +00:00
Ubuntu
3f4c9b8af4 mystery printfs 2014-10-08 00:32:37 +00:00
vere
97ca5fb2c8 bump protocol to 4 2014-10-06 21:31:21 +00:00
C. Guy Yarvin
d21bfc80e9 Update h.h from test. 2014-10-04 16:20:55 -07:00
C. Guy Yarvin
8f738539c2 Improved signal handling. 2014-10-04 14:57:40 -07:00
Anton Dyudin
179fa6d6c6 Comments 2014-10-03 18:22:37 -07:00
Ubuntu
4788c99669 Merge branch 'shell' of https://github.com/urbit/urbit into shell
Conflicts:
	urb/urbit.pill
	urb/zod/main/app/terminal/core.hook
2014-10-03 22:39:33 +00:00
Ubuntu
5ed630ef61 forgot to commit eyre, gall 2014-10-03 22:32:10 +00:00
Anton Dyudin
48f4579f10 Merge branch 'shell' of https://github.com/urbit/urbit into shell
Conflicts:
	urb/urbit.pill
	urb/zod/main/app/shell/core.hook
	urb/zod/main/app/terminal/core.hook
2014-10-02 17:18:16 -07:00
Ubuntu
f273b2dcf2 added :hi 2014-10-02 23:35:07 +00:00
vere
2482bceff1 bump protocol to 3 2014-10-02 23:12:44 +00:00
Anton Dyudin
8b499d6d12 Merge branch 'shell' of https://github.com/urbit/urbit into shell 2014-10-02 13:03:39 -07:00
Anton Dyudin
bc5128694d Added check for missing return ducts 2014-10-02 12:46:00 -07:00
Ubuntu
11b70091a0 improved ford block handling 2014-10-02 19:27:15 +00:00
Ubuntu
98b9003409 fixed ford blocking 2014-10-02 18:53:53 +00:00
Ubuntu
c410072215 ford error message on improper horns 2014-10-01 21:17:32 +00:00
Ubuntu
130b9ff10b task switching 2014-10-01 00:29:32 +00:00
C. Guy Yarvin
91370e9b81 Various fixes and improvements. 2014-09-30 09:45:51 -07:00
Anton Dyudin
56abfcfdbd Backported h.h comment refinements 2014-09-29 19:50:50 -07:00
vere
a2786b12a9 bump protocol to 2 2014-09-30 00:51:18 +00:00
Ubuntu
3f7c68fe7d bump protocol to 1 2014-09-29 18:02:32 +00:00
C. Guy Yarvin
81b5ab0c49 Moar sane. 2014-09-27 16:17:09 -07:00
C. Guy Yarvin
615cb19c21 Profiling, sorta. 2014-09-26 19:17:43 -07:00
Ubuntu
9cccaf2d2c better %gall error messages 2014-09-26 22:08:57 +00:00
C. Guy Yarvin
cffc2a545c Add simple profiling state. 2014-09-26 13:23:27 -07:00
C. Guy Yarvin
55e40f40e8 Merge branch 'test' of https://github.com/urbit/urbit into test
Conflicts:
	urb/urbit.pill
2014-09-26 12:11:13 -07:00
Ubuntu
5b95fbe4a4 remove %bad-key printf 2014-09-26 18:32:21 +00:00
vere
3df24efda5 bump protocol to 0 2014-09-26 17:34:54 +00:00
Anton Dyudin
2b72cba49e Arbitrary mark printing sorta worx 2014-09-25 17:54:51 -07:00
C. Guy Yarvin
a1645bdc60 Remove bad jets etc. 2014-09-24 23:41:09 -07:00
C. Guy Yarvin
d5b3bc8222 Debug. 2014-09-24 23:08:22 -07:00
C. Guy Yarvin
082d8424b8 Various fixes. 2014-09-24 22:44:14 -07:00
Ubuntu
fb2e290b32 first shell apps 2014-09-25 00:37:29 +00:00
C. Guy Yarvin
68ea2917ae Various fixes and improvements. 2014-09-24 16:21:18 -07:00
C. Guy Yarvin
55e1f24999 Stashing. 2014-09-24 14:29:19 -07:00
Anton Dyudin
8868cafbb7 Fixed ^:tyl/pax irregular form 2014-09-24 12:59:09 -07:00
Ubuntu
a0b8e49f65 Merge branch 'master' of https://github.com/urbit/urbit 2014-09-24 01:50:34 +00:00
vere
57a1088a2b bump protocol to 7 2014-09-24 01:47:31 +00:00
Ubuntu
3cc061b5d8 claimed ~tug 2014-09-24 01:42:21 +00:00
Anton Dyudin
e356f54e1d ~fyr demoted from ++crub fingerprint (oops) 2014-09-23 18:26:10 -07:00
Ubuntu
4b40092688 %- dec arvo-proper-bugs 2014-09-24 01:03:20 +00:00
C. Guy Yarvin
a4bec78419 Various fixes and improvements. 2014-09-23 10:11:59 -07:00
vere
2108f6c223 bump to protocol number 6 2014-09-23 05:59:08 +00:00
Ubuntu
ccd389b4a8 shell work 2014-09-22 22:20:47 +00:00
Anton Dyudin
ab73ecb798 Protocol roll 5 2014-09-20 13:01:14 -07:00
Anton Dyudin
0419256713 Protocol roll 4 2014-09-18 19:48:35 -07:00
C. Guy Yarvin
8e3c922b02 More !: for u3 bug. 2014-09-18 12:42:28 -07:00
C. Guy Yarvin
193d3b0feb Update urbit.pill with !: on crua for u3 jet error. 2014-09-18 12:19:18 -07:00
Ubuntu
7e445e92f4 terminal working 2014-09-18 02:56:49 +00:00
Ubuntu
e95c042e85 cleanup 2014-09-17 22:25:58 +00:00
Ubuntu
d0e81dcd7a %gall seems to be working 2014-09-17 21:23:48 +00:00
C. Guy Yarvin
9f22287791 Merges and bugfixes. 2014-09-16 17:29:12 -07:00
Ubuntu
3375c8f048 telling next of kin 2014-09-17 00:04:58 +00:00
Ubuntu
f92a265216 finished clay doc 2014-09-16 15:25:06 +00:00
Ubuntu
fabf390eac updated clay doc and code 2014-09-16 14:19:15 +00:00
Ubuntu
0f7ce25b9e improved %gall kill handling 2014-09-16 02:56:44 +00:00
Anton Dyudin
f5f9e7f17c Merge branch 'test' of https://github.com/urbit/urbit into test
Conflicts:
	urb/urbit.pill
2014-09-15 18:20:30 -07:00
C. Guy Yarvin
c5a2f469bc Debugging stash. 2014-09-15 16:56:37 -07:00
vere
f908ed73d5 bump to protocol 3 2014-09-15 19:45:20 +00:00
C. Guy Yarvin
baab963d78 Another fake jet. 2014-09-14 20:38:19 -07:00
C. Guy Yarvin
e44b3766e0 Elide superfluous dummy jet for ++sear. 2014-09-14 20:34:32 -07:00
C. Guy Yarvin
c39192be81 Continuity breach to protocol 2. 2014-09-14 14:57:07 -07:00
Anton Dyudin
acca268df3 Partially fixed %gall .^ 2014-09-13 17:56:36 -07:00
C. Guy Yarvin
5477531755 Jets? 2014-09-12 16:06:33 -07:00
C. Guy Yarvin
be18a61cb1 Boot process. 2014-09-12 12:32:59 -07:00
C. Guy Yarvin
6f17001337 Merge branch 'test' of https://github.com/urbit/urbit into test 2014-09-12 11:33:36 -07:00
Ubuntu
c14d6b4d05 basic terminal and shell apps 2014-09-12 02:11:03 +00:00
Ubuntu
c2e05b0e2f ability to sire 2014-09-11 20:44:46 +00:00
Ubuntu
9a78321ecd Merge branch 'test' of https://github.com/urbit/urbit into test 2014-09-11 18:52:39 +00:00
Ubuntu
102fced646 clay fixes 2014-09-11 18:52:25 +00:00
Galen Wolfe-Pauly
26f18774f5 Merge branch 'test' of github.com:urbit/urbit-new into test 2014-09-11 11:01:22 -07:00
Galen Wolfe-Pauly
3bb082fbdc finally favicon. not perfect, but better. 2014-09-11 11:00:58 -07:00
Ubuntu
ba92dee46b basic skeleton of %sire 2014-09-11 00:55:44 +00:00
Ubuntu
dd1b229b6b separate app identity from instance 2014-09-10 23:35:03 +00:00
Anton Dyudin
d54584a164 Merge branch 'test' of https://github.com/urbit/urbit into test
Conflicts:
	urb/urbit.pill
2014-09-10 13:03:06 -07:00
Anton Dyudin
fccc933066 (sear plex rood):vast now usable as a parser 2014-09-10 13:00:23 -07:00
Ubuntu
d0d80f6ce2 clay foreign request doc done 2014-09-10 19:52:06 +00:00
Ubuntu
21e4a6953a Merge branch 'master' into test
Conflicts:
	urb/urbit.pill
2014-09-10 18:46:31 +00:00
C. Guy Yarvin
07cf59be1b Merge branch 'test' into memorable
Conflicts:
	Makefile
	gen164/watt.c
2014-09-10 09:06:30 -07:00
Ubuntu
43ab4df454 Merge branch 'test' of https://github.com/urbit/urbit into test 2014-09-10 00:31:52 +00:00
Ubuntu
8732d6e097 clay local subscription doc done 2014-09-10 00:31:17 +00:00
vere
41a1eb9cc1 bump protocol number 2014-09-09 23:12:09 +00:00
Anton Dyudin
b45f3e374e Fixed (sand %ta) to conform to doc 2014-09-09 14:38:19 -07:00
Anton Dyudin
56f03cc709 Merge branch 'test' of https://github.com/urbit/urbit into test 2014-09-09 14:33:51 -07:00
Ubuntu
0b7ce49282 reflect clay refactor in doc 2014-09-09 20:25:00 +00:00
Anton Dyudin
2bc68f86ec Merge branch 'test' of https://github.com/urbit/urbit into test 2014-09-09 12:51:56 -07:00
Anton Dyudin
f4adae2471 Removed redundant duty args 2014-09-09 12:46:42 -07:00
Ubuntu
1fc560e94e Merge branch 'test' of https://github.com/urbit/urbit into test 2014-09-09 18:53:36 +00:00
Ubuntu
d789f4ec88 more clay refactoring 2014-09-09 18:53:27 +00:00
C. Guy Yarvin
9456e17bae Tweak test. 2014-09-08 19:38:41 -07:00
C. Guy Yarvin
76c9b03166 Compatible with k.164. 2014-09-08 19:35:25 -07:00
Ubuntu
c405a4bd7a some clay refactoring 2014-09-09 00:21:40 +00:00
vere
9c5a438955 bump protocol number 2014-09-08 21:06:21 +00:00
C. Guy Yarvin
f79aa14786 Better tools for test kernels. 2014-09-06 19:54:25 -07:00
Ubuntu
ef15359455 clay bug fix 2014-09-05 22:59:56 +00:00
Ubuntu
539c6c2710 now you can subscribe to individual directories 2014-09-05 22:10:11 +00:00
Ubuntu
f84354bdcd Merge branch 'master' into test
Conflicts:
	urb/urbit.pill
2014-09-05 16:22:22 +00:00
C. Guy Yarvin
99072c03b1 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
a386d59068 Fix ++nest bug - in hoon.hoon only for now. 2014-09-04 17:24:27 -07:00
Anton Dyudin
d83db302f6 /gep/hart.js long-poll utils factored out 2014-09-04 14:37:29 -07:00
Ubuntu
b74dc1aee9 Merge branch 'test' of https://github.com/urbit/urbit into test
Conflicts:
	urb/urbit.pill
2014-09-03 20:04:27 +00:00