Philip C Monk
|
95867fafcf
|
ignore dry/wet directory distinction
|
2015-06-02 15:59:39 -04:00 |
|
Philip C Monk
|
0143c3ca21
|
Merge branch 'test' of https://github.com/urbit/urbit into test
|
2015-06-02 15:14:27 -04:00 |
|
Philip C Monk
|
91713054f8
|
fix a couple of small memory leaks
|
2015-06-01 21:31:37 -04:00 |
|
C. Guy Yarvin
|
e54b7f8d89
|
Merge branch 'test' into demo
Conflicts:
urb/urbit.pill
|
2015-06-01 16:47:09 -07:00 |
|
Anton Dyudin
|
bfc3d70902
|
Merge branch 'test' of https://github.com/urbit/urbit into test
Conflicts:
urb/urbit.pill
|
2015-06-01 16:25:21 -07:00 |
|
Philip C Monk
|
5525f22c1c
|
fix build
|
2015-06-01 16:06:01 -04:00 |
|
C. Guy Yarvin
|
d7ec8c1880
|
Merge branch 'test' into demo
Conflicts:
urb/urbit.pill
|
2015-06-01 10:59:17 -07:00 |
|
C. Guy Yarvin
|
dedce2cdb3
|
Moar filez.
|
2015-06-01 06:34:06 -07:00 |
|
Philip C Monk
|
bfd1caaeea
|
Merge branch 'nextbreach' into test
Conflicts:
urb/zod/base/ape/hood/core.hook
urb/zod/base/lib/kiln/core.hook
|
2015-05-31 23:36:30 -04:00 |
|
Galen Wolfe-Pauly
|
2b281a79e9
|
demo network
|
2015-05-31 12:07:42 -07:00 |
|
C. Guy Yarvin
|
322cc92427
|
Merge branch 'test' of https://github.com/urbit/urbit into test
|
2015-05-29 12:45:27 -07:00 |
|
Anton Dyudin
|
95a59a2b67
|
updated gitignore
|
2015-05-29 12:13:49 -07:00 |
|
Anton Dyudin
|
2b5fdca621
|
Merge branch 'test' of https://github.com/urbit/urbit into test
|
2015-05-29 12:09:42 -07:00 |
|
C. Guy Yarvin
|
700173142a
|
Merge branch 'test' of https://github.com/urbit/urbit into test
Conflicts:
urb/zod/base/ape/octo/core.hook
|
2015-05-29 01:37:12 -07:00 |
|
Anton Dyudin
|
4adb4a701d
|
Merge branch 'test' of https://github.com/urbit/urbit into test
|
2015-05-28 16:34:40 -07:00 |
|
Anton Dyudin
|
dedad89acb
|
Merge branch 'test' of https://github.com/urbit/urbit into test
Conflicts:
urb/zod/base/ape/bit/core.hook
|
2015-05-28 16:34:26 -07:00 |
|
C. Guy Yarvin
|
682efcdac0
|
Merge branch 'test' into goodtest
|
2015-05-28 12:17:44 -07:00 |
|
C. Guy Yarvin
|
e11b1a5468
|
Merge branch 'test' into goodtest
Conflicts:
urb/urbit.pill
urb/zod/base/ape/dojo/core.hook
urb/zod/base/ape/hood/core.hook
urb/zod/base/ape/octo/core.hook
urb/zod/base/arvo/hoon.hoon
|
2015-05-28 12:16:10 -07:00 |
|
Anton Dyudin
|
f414331d80
|
Merge branch 'test' of https://github.com/urbit/urbit into test
|
2015-05-28 11:10:20 -07:00 |
|
Henry Ault
|
daa0a70d2b
|
Merge branch 'test' of https://github.com/urbit/urbit into test
|
2015-05-26 17:29:15 -07:00 |
|
Philip C Monk
|
0ef81e84ef
|
better unix.c errors
|
2015-05-26 19:53:37 -04:00 |
|
Anton Dyudin
|
941aaf99ab
|
Merge branch 'master' into test
Conflicts:
urb/urbit.pill
urb/zod/base/pub/tree/src/js/components/CodeMirror.coffee
urb/zod/base/pub/tree/src/js/main.js
|
2015-05-26 15:12:26 -07:00 |
|
Anton Dyudin
|
75dcff7dd0
|
Merge branch 'test'@0b9d56f
Conflicts:
urb/urbit.pill
|
2015-05-26 14:45:48 -07:00 |
|
Anton Dyudin
|
7ee7c73327
|
Merge branch 'test' of https://github.com/urbit/urbit into test
|
2015-05-26 13:57:30 -07:00 |
|
Henry Ault
|
1cf1581aaa
|
Merge branch 'test' of https://github.com/urbit/urbit into test
|
2015-05-25 19:28:24 -07:00 |
|
demo
|
1817064468
|
Merge branch 'master' of https://github.com/urbit/urbit
|
2015-05-25 19:14:34 +00:00 |
|
demo
|
ca024f1ceb
|
better ssl error reporting
|
2015-05-25 19:14:20 +00:00 |
|
Galen Wolfe-Pauly
|
18d70ee885
|
bin/viere -> bin/urbit in readme
|
2015-05-25 10:38:26 -07:00 |
|
Anton Dyudin
|
8a28e44e7f
|
Merge branch 'test' of https://github.com/urbit/urbit into test
|
2015-05-21 17:40:05 -07:00 |
|
Henry Ault
|
1555c3acfa
|
Merge branch 'do' into test
|
2015-05-21 17:24:09 -07:00 |
|
Anton Dyudin
|
7b2ad984b0
|
Merge branch 'test' of https://github.com/urbit/urbit into test
Conflicts:
urb/urbit.pill
|
2015-05-21 16:04:11 -07:00 |
|
C. Guy Yarvin
|
77e08e1b1f
|
Merge branch 'master' of https://github.com/urbit/urbit
|
2015-05-21 15:35:30 -07:00 |
|
C. Guy Yarvin
|
82eca79910
|
No dirty pages
|
2015-05-21 15:35:14 -07:00 |
|
C. Guy Yarvin
|
6088ddcef5
|
No dirty pages.
|
2015-05-21 15:34:49 -07:00 |
|
Philip C Monk
|
31dfd24dc5
|
plug new memory leak
|
2015-05-21 15:15:41 -04:00 |
|
C. Guy Yarvin
|
abd9afc1ea
|
No dirty pages.
|
2015-05-21 11:33:04 -07:00 |
|
Philip C Monk
|
36ac4e041d
|
Merge branch 'nextbreach'
Conflicts:
urb/urbit.pill
|
2015-05-21 13:49:21 -04:00 |
|
C. Guy Yarvin
|
ed40602cbe
|
Fix up demo a little bit.
|
2015-05-21 09:05:14 -07:00 |
|
C. Guy Yarvin
|
3a790011f6
|
Merge branch 'master' into test
|
2015-05-20 23:17:02 -07:00 |
|
C. Guy Yarvin
|
f1491de7f4
|
Merge branch 'test' of https://github.com/urbit/urbit into test
|
2015-05-20 23:09:05 -07:00 |
|
Philip C Monk
|
fa17629697
|
improved unix sync
|
2015-05-20 20:32:54 -04:00 |
|
C. Guy Yarvin
|
bb97c37d46
|
Merge branch 'master' of https://github.com/urbit/urbit
|
2015-05-20 16:59:17 -07:00 |
|
C. Guy Yarvin
|
9c8222ea02
|
Merge branch 'test'
|
2015-05-20 16:58:58 -07:00 |
|
Anton Dyudin
|
277bfda9af
|
Update commands.txt
|
2015-05-20 15:25:25 -07:00 |
|
Anton Dyudin
|
787fa17eba
|
Merge branch 'test' of https://github.com/urbit/urbit into test
|
2015-05-20 15:13:42 -07:00 |
|
Henry Ault
|
a4a2f0c789
|
Merge branch 'do' of https://github.com/urbit/urbit into do
Conflicts:
urb/zod/base/ape/bit/core.hook
|
2015-05-20 13:50:42 -07:00 |
|
Anton Dyudin
|
9103a1cd06
|
Update commands.txt
Don't forget to start :bit
|
2015-05-20 13:23:35 -07:00 |
|
Henry Ault
|
deceedd591
|
bitcoin instructions
|
2015-05-20 12:39:14 -07:00 |
|
C. Guy Yarvin
|
b915ade744
|
Merge branch 'test'
Conflicts:
urb/urbit.pill
|
2015-05-20 12:33:34 -07:00 |
|
C. Guy Yarvin
|
08b3e2710c
|
Merge branch 'test'
Conflicts:
urb/urbit.pill
|
2015-05-20 12:29:30 -07:00 |
|