Galen Wolfe-Pauly
|
9667179223
|
Merge branch 'test' of github.com:urbit/urbit into test
|
2015-05-08 16:48:05 -07:00 |
|
Galen Wolfe-Pauly
|
369dd1878a
|
tree for editing
|
2015-05-08 16:47:46 -07:00 |
|
C. Guy Yarvin
|
fbf9930b34
|
test now switched over to behn.
|
2015-05-08 16:02:50 -07:00 |
|
Galen Wolfe-Pauly
|
4f1a7b537b
|
fix audience
|
2015-05-08 15:56:33 -07:00 |
|
Galen Wolfe-Pauly
|
5a0d576bd3
|
not staging;
|
2015-05-08 15:15:17 -07:00 |
|
Galen Wolfe-Pauly
|
c24c9e68d9
|
Merge branch 'test' of github.com:urbit/urbit into test
|
2015-05-08 15:00:45 -07:00 |
|
C. Guy Yarvin
|
e15fcdbcda
|
Unbreak eyre.
|
2015-05-08 13:57:34 -07:00 |
|
Galen Wolfe-Pauly
|
cf6bc4d3fc
|
talk updates
|
2015-05-08 13:29:24 -07:00 |
|
C. Guy Yarvin
|
eee0cbeb4b
|
Merge branch 'test' of https://github.com/urbit/urbit into test
|
2015-05-08 13:28:18 -07:00 |
|
C. Guy Yarvin
|
c58b0611f0
|
eyre ready to talk to behn.
|
2015-05-08 13:27:40 -07:00 |
|
C. Guy Yarvin
|
802a76a279
|
Command-line functionality with %behn.
|
2015-05-08 12:43:11 -07:00 |
|
Anton Dyudin
|
4a0a43f6b4
|
Merge branch 'test' of https://github.com/urbit/urbit into test
|
2015-05-08 11:26:39 -07:00 |
|
Anton Dyudin
|
e5e3045daf
|
add tym to dojo
|
2015-05-08 11:26:21 -07:00 |
|
C. Guy Yarvin
|
b0eac3721a
|
Latest stuff hand-merged from %behn.
|
2015-05-08 10:56:30 -07:00 |
|
C. Guy Yarvin
|
ceb79e045f
|
Prepare the doll.
|
2015-05-08 10:53:28 -07:00 |
|
Henry Ault
|
2a2aa4fc09
|
better talk flow
|
2015-05-07 17:01:25 -07:00 |
|
Henry Ault
|
cf5587c3db
|
message to sender
|
2015-05-07 16:53:08 -07:00 |
|
henry
|
799baff5a5
|
Various fixes and improvements -- bit
|
2015-05-07 19:27:50 -04:00 |
|
henry
|
f0e3a88ea8
|
precommit
|
2015-05-07 19:25:22 -04:00 |
|
Henry Ault
|
19c6469956
|
switch on port #
|
2015-05-07 15:23:22 -07:00 |
|
Henry Ault
|
12550a7e89
|
merge local
|
2015-05-07 15:02:24 -07:00 |
|
Henry Ault
|
4c117a9418
|
merge test
|
2015-05-07 14:34:49 -07:00 |
|
Henry Ault
|
c464f0fbb3
|
fake network
|
2015-05-07 14:33:18 -07:00 |
|
Anton Dyudin
|
99c5992ed1
|
Merge branch 'master' of https://github.com/urbit/urbit to fix #278
Conflicts:
urb/urbit.pill
|
2015-05-07 14:18:19 -07:00 |
|
Anton Dyudin
|
60eb11a0f7
|
fix ames begin to talk to gall
|
2015-05-07 14:17:39 -07:00 |
|
Philip C Monk
|
eccaacd790
|
revert errant clay change
|
2015-05-07 16:32:37 -04:00 |
|
Galen Wolfe-Pauly
|
d7a2dd9905
|
off by one
|
2015-05-07 12:16:48 -07:00 |
|
vere
|
becc52fecd
|
Revert "test roll 6"
This reverts commit 638ad719a81d9e58f285c3d17ef4238741da6ff0.
|
2015-05-07 19:04:47 +00:00 |
|
Galen Wolfe-Pauly
|
b4f0dc6143
|
audience
|
2015-05-07 11:47:25 -07:00 |
|
vere
|
c45ab98654
|
test roll 6
|
2015-05-07 18:44:32 +00:00 |
|
Henry Ault
|
fdf8a0639a
|
send bitcoin and view address where you received
|
2015-05-07 11:26:10 -07:00 |
|
Galen Wolfe-Pauly
|
408b2f0cef
|
colors
|
2015-05-07 10:49:56 -07:00 |
|
Anton Dyudin
|
b8c3720c28
|
continuity roll 5
|
2015-05-07 10:36:29 -07:00 |
|
Anton Dyudin
|
b65fc83aa6
|
Merge branch 'test'
|
2015-05-07 10:31:10 -07:00 |
|
Anton Dyudin
|
b72da57ce8
|
Merge branch 'space-tools' into test
Conflicts:
urb/urbit.pill
urb/zod/base/arvo/time.hoon
|
2015-05-07 10:30:32 -07:00 |
|
Henry Ault
|
c77662a009
|
Merge branch 'do' of http://github.com/urbit/urbit into do
Conflicts:
urb/zod/base/app/bit/core.hook
|
2015-05-07 02:51:55 -04:00 |
|
Henry Ault
|
478d210298
|
ported to real network
|
2015-05-07 02:49:30 -04:00 |
|
Henry Ault
|
4b928f5e22
|
port forward
|
2015-05-07 02:47:41 -04:00 |
|
C. Guy Yarvin
|
de80178627
|
Hand-merge in all newgall files.
|
2015-05-06 19:31:54 -07:00 |
|
Henry Ault
|
999ca3535b
|
publisher update
|
2015-05-06 19:29:56 -07:00 |
|
Philip C Monk
|
98801c4a14
|
added space profiling tools
|
2015-05-06 22:25:41 -04:00 |
|
C. Guy Yarvin
|
9d55c17455
|
Hand-merge behn and gall.
|
2015-05-06 19:25:10 -07:00 |
|
C. Guy Yarvin
|
61610b4669
|
Revert to less broken console library.
|
2015-05-06 19:18:06 -07:00 |
|
C. Guy Yarvin
|
54165e49b8
|
Merge branch 'master' into test
Conflicts:
urb/urbit.pill
|
2015-05-06 19:13:15 -07:00 |
|
C. Guy Yarvin
|
2af8dd2263
|
Hand-merge ames and time from newgall.
|
2015-05-06 19:00:58 -07:00 |
|
Galen Wolfe-Pauly
|
5236fcbb1e
|
Merge pull request #279 from yebyen/master
sorry more spelling
|
2015-05-06 18:56:58 -07:00 |
|
Kingdon
|
f1533c8972
|
necessary
|
2015-05-06 21:53:05 -04:00 |
|
C. Guy Yarvin
|
3295f1797b
|
Hand-merged ford, zuse and hoon from newgall.
|
2015-05-06 18:41:20 -07:00 |
|
Galen Wolfe-Pauly
|
70cb0566d8
|
minor
|
2015-05-06 18:24:43 -07:00 |
|
Galen Wolfe-Pauly
|
b3e4633e1f
|
new look
|
2015-05-06 18:01:36 -07:00 |
|