Galen Wolfe-Pauly
|
24f970eb4f
|
not listening
|
2015-05-14 16:06:56 -07:00 |
|
Philip C Monk
|
53c01ebe81
|
removed bad printf
|
2015-05-14 18:45:22 -04:00 |
|
Philip C Monk
|
999e19e3c2
|
Merge branch 'test' of https://github.com/urbit/urbit into test
Conflicts:
urb/urbit.pill
|
2015-05-14 18:37:39 -04:00 |
|
Philip C Monk
|
ed727923ea
|
Merge branch 'test' of https://github.com/urbit/urbit into test
|
2015-05-14 18:01:42 -04:00 |
|
Anton Dyudin
|
6aead63e77
|
Merge branch 'test' of https://github.com/urbit/urbit into test
|
2015-05-14 15:01:39 -07:00 |
|
Anton Dyudin
|
8ba1b0ccf3
|
switching sole
|
2015-05-14 15:01:31 -07:00 |
|
Anton Dyudin
|
d02e9e44ff
|
Merge branch 'test' of https://github.com/urbit/urbit into test
|
2015-05-14 14:59:57 -07:00 |
|
Anton Dyudin
|
94aa7c7678
|
switching sole
|
2015-05-14 14:59:45 -07:00 |
|
Galen Wolfe-Pauly
|
4a13e03bd9
|
Merge branch 'test' of github.com:urbit/urbit into test
|
2015-05-14 14:05:30 -07:00 |
|
Galen Wolfe-Pauly
|
64d6e9696e
|
full talk name
|
2015-05-14 13:57:12 -07:00 |
|
Philip C Monk
|
ee4a39d600
|
sped up merges
|
2015-05-14 16:30:03 -04:00 |
|
Anton Dyudin
|
5ac01defea
|
Merge branch 'test' of https://github.com/urbit/urbit into test
|
2015-05-14 13:13:58 -07:00 |
|
Anton Dyudin
|
6656d49283
|
switchable websole v1
|
2015-05-14 13:13:45 -07:00 |
|
C. Guy Yarvin
|
e190e20256
|
Checking in for fun and profit.
|
2015-05-14 12:24:43 -07:00 |
|
Galen Wolfe-Pauly
|
ab48a5f0f1
|
path out of talk
|
2015-05-14 12:21:13 -07:00 |
|
Philip C Monk
|
6b956e0dcb
|
added %scot jet hint
|
2015-05-14 14:12:12 -04:00 |
|
Anton Dyudin
|
293946d35f
|
Merge branch 'test' of https://github.com/urbit/urbit into test
|
2015-05-14 11:04:49 -07:00 |
|
Anton Dyudin
|
15bcbb23e7
|
cleaning up %base to %home
|
2015-05-14 11:04:32 -07:00 |
|
Philip C Monk
|
60365b5ae8
|
added %slaw jet hint
|
2015-05-14 13:46:52 -04:00 |
|
C. Guy Yarvin
|
04379dac6e
|
Merge branch 'test' of https://github.com/urbit/urbit into test
Conflicts:
urb/urbit.pill
|
2015-05-13 17:15:06 -07:00 |
|
C. Guy Yarvin
|
cc2a7defb5
|
Various fixes and improvements.
|
2015-05-13 16:31:13 -07:00 |
|
Galen Wolfe-Pauly
|
df358f27c4
|
Merge branch 'test' of github.com:urbit/urbit into test
|
2015-05-13 16:22:03 -07:00 |
|
Galen Wolfe-Pauly
|
7d733fd85c
|
whom
|
2015-05-13 16:21:51 -07:00 |
|
Anton Dyudin
|
f39de10190
|
Merge remote-tracking branch 'origin/test' into do
|
2015-05-13 16:12:58 -07:00 |
|
Philip C Monk
|
6cb1505288
|
fixed merges
|
2015-05-13 17:18:43 -04:00 |
|
Anton Dyudin
|
b60cf4d702
|
port complete
|
2015-05-13 13:17:38 -07:00 |
|
Anton Dyudin
|
5d252b315e
|
Merge branch 'test' into do
|
2015-05-13 12:46:39 -07:00 |
|
Anton Dyudin
|
a8578d4ed2
|
port1
|
2015-05-13 12:46:25 -07:00 |
|
Anton Dyudin
|
77796a4fa6
|
Merge branch 'test' into do
Conflicts:
urb/urbit.pill
urb/zod/base/arvo/dill.hoon
urb/zod/base/arvo/gall.hoon
|
2015-05-13 12:21:53 -07:00 |
|
C. Guy Yarvin
|
2b940d9346
|
Various fixes and improvements; test can :?begin.
|
2015-05-13 01:02:34 -07:00 |
|
vere
|
96411cdf33
|
Merge branch 'master' of https://github.com/urbit/urbit
|
2015-05-13 00:12:18 +00:00 |
|
Philip Monk
|
aa43f62c75
|
Merge pull request #280 from chc4/master
Awesome, thanks so much!
|
2015-05-12 16:47:38 -07:00 |
|
Anton Dyudin
|
f2a90e2bf6
|
cleaning
|
2015-05-12 16:39:40 -07:00 |
|
Henry Ault
|
3884808c55
|
Merge remote-tracking branch 'origin/master' into do
|
2015-05-12 15:59:28 -07:00 |
|
Henry Ault
|
689b5df159
|
about to port
|
2015-05-12 15:58:27 -07:00 |
|
Galen Wolfe-Pauly
|
8b2b182cf1
|
Merge branch 'test' of github.com:urbit/urbit into test
|
2015-05-12 15:21:25 -07:00 |
|
Galen Wolfe-Pauly
|
6ac76f9f73
|
octo frontend
|
2015-05-12 15:21:10 -07:00 |
|
C. Guy Yarvin
|
30d32255b9
|
Let %them through.
|
2015-05-12 15:00:18 -07:00 |
|
Philip C Monk
|
4bc1fc316d
|
forgot to commit the mass cat
|
2015-05-12 17:59:27 -04:00 |
|
Philip C Monk
|
7f7512e3dc
|
bump to protocol 6
|
2015-05-12 17:31:25 -04:00 |
|
Philip C Monk
|
b2eddf4f83
|
Merge remote-tracking branch 'origin/master' into space-tools
Conflicts:
urb/urbit.pill
|
2015-05-12 17:24:24 -04:00 |
|
Philip C Monk
|
d43169dc17
|
reworked ++mass
|
2015-05-12 17:18:34 -04:00 |
|
C. Guy Yarvin
|
6dcbda8df4
|
Merge branch 'test' of https://github.com/urbit/urbit into test
Conflicts:
urb/urbit.pill
urb/zod/base/ape/helm/core.hook
|
2015-05-12 13:36:21 -07:00 |
|
C. Guy Yarvin
|
5665fb132a
|
Various cleanups.
|
2015-05-12 13:10:22 -07:00 |
|
Anton Dyudin
|
fdbf46ce16
|
added json octo interfaces
|
2015-05-12 12:57:58 -07:00 |
|
Anton Dyudin
|
23939c6dfd
|
Merge branch 'test' of https://github.com/urbit/urbit into test
|
2015-05-11 17:51:00 -07:00 |
|
Anton Dyudin
|
5d718597c5
|
sole transmute fix
|
2015-05-11 17:50:40 -07:00 |
|
C. Guy Yarvin
|
6952ecaa75
|
Switch from helm to hood.
|
2015-05-11 17:43:47 -07:00 |
|
C. Guy Yarvin
|
2cfe3c252b
|
Merge branch 'test' of https://github.com/urbit/urbit into test
|
2015-05-11 17:32:47 -07:00 |
|
C. Guy Yarvin
|
1f2ed6ae76
|
Merge old helm code into hood/kiln.
|
2015-05-11 17:31:37 -07:00 |
|