Philip C Monk
479d2dbf06
added :helm+init
2015-04-08 14:27:51 -04:00
Philip C Monk
6b540820ad
Merge branch 'master' of https://github.com/urbit/urbit
2015-04-07 19:16:18 -04:00
Philip C Monk
0be5716a46
Merge branch 'master' of https://github.com/urbit/urbit
2015-04-07 18:49:43 -04:00
C. Guy Yarvin
9c66b9cddc
Merge branch 'master' into dillbo
...
Conflicts:
urb/zod/docs/pub/doc/guide/a-ford.md
2015-04-07 15:18:07 -07:00
C. Guy Yarvin
b5c216a65d
Merge branch 'dillbo' of https://github.com/urbit/urbit into dillbo
2015-04-01 14:03:40 -07:00
C. Guy Yarvin
5802a4e52d
Various fixes and improvements.
2015-04-01 13:56:43 -07:00
Philip C Monk
e8870285ac
make subs boot again
2015-03-31 15:52:47 -04:00
Philip Monk
c99402d080
Merge pull request #268 from TJamesCorcoran/master
...
emacs tweak, ford doc tweak
2015-03-30 11:11:17 -07:00
C. Guy Yarvin
4fc55346aa
Merge branch 'dillbo' of https://github.com/urbit/urbit into dillbo
...
Conflicts:
urb/urbit.pill
2015-03-27 13:08:04 -07:00
TJamesCorcoran
27a0e0e1dc
smarter way to accomplish the verbosity on the mode line: rename-buffer
2015-03-27 14:03:03 -04:00
cgyarvin
2366c1b190
Merge pull request #267 from mrdomino/calloc-overflow
...
Overflow detection in u3a_calloc
2015-03-27 10:54:26 -07:00
Steven Dee
b5343f227b
Overflow detection in u3a_calloc
...
This implementation assumes that u3a_calloc is always called with
safe sizes and just asserts that.
2015-03-27 12:14:23 -04:00
Philip C Monk
f62ff0fd66
notification-only subscription path
2015-03-26 19:26:39 -04:00
Galen Wolfe-Pauly
93dc541115
here comes talk
2015-03-26 14:00:45 -07:00
Anton Dyudin
01d403b2a6
Merge branch 'eyre-new' into dillbo
...
Conflicts:
urb/urbit.pill
2015-03-26 13:33:08 -07:00
Philip Monk
713b2af685
Merge pull request #266 from TJamesCorcoran/master
...
modeline bar improvements
2015-03-26 11:38:32 -07:00
TJamesCorcoran
a500899603
modeline bar better
2015-03-26 14:32:56 -04:00
Philip C Monk
adca2c2353
fix 7MB/revision memory leak
2015-03-25 18:35:47 -04:00
Galen Wolfe-Pauly
3312d319b9
Merge branch 'dillbo' into talk
2015-03-25 14:06:08 -07:00
Galen Wolfe-Pauly
337dc5d45d
Merge branch 'dillbo' into talk
2015-03-25 11:59:44 -07:00
Galen Wolfe-Pauly
66773c8e31
Merge branch 'dillbo' into talk
2015-03-24 17:37:17 -07:00
Galen Wolfe-Pauly
4e7d3dcf7b
Merge branch 'dillbo' into talk
2015-03-24 17:16:00 -07:00
Anton Dyudin
2669bcf0f5
Merge branch 'master' into eyre-new
...
Conflicts:
urb/urbit.pill
urb/zod/docs/pub/doc/arvo/util.md
2015-03-24 17:01:13 -07:00
Anton Dyudin
add40d4dee
Fixed ford ot anchor at current main revision, not time
...
Conflicts:
n/t.c
urb/zod/main/arvo/ford.hoon
v/raft.c
2015-03-24 19:27:49 -04:00
Philip C Monk
7daed9bcb3
waypoint
2015-03-24 17:46:32 -04:00
Anton Dyudin
cbe3c02e24
Cached %bake
...
Conflicts:
urb/zod/main/arvo/ford.hoon
urb/zod/main/mar/react-snip/door.hook
urb/zod/main/mar/react/door.hook
v/raft.c
2015-03-24 16:30:30 -04:00
Galen Wolfe-Pauly
ac22b5a107
Merge branch 'dillbo' into talk
2015-03-24 12:22:23 -07:00
Philip C Monk
a4764f8279
autosync works
2015-03-23 16:40:33 -04:00
C. Guy Yarvin
45d60e75de
Fix up :seat a bunch.
2015-03-22 21:37:01 -07:00
C. Guy Yarvin
330dd3da35
About to work :talk into the command line mix.
2015-03-20 11:31:02 -07:00
Galen Wolfe-Pauly
e9e31b8d94
Merge branch 'dillbo' into talk
2015-03-20 10:47:44 -07:00
Galen Wolfe-Pauly
9ae8048bc3
Merge branch 'dillbo' into talk
2015-03-19 13:14:17 -07:00
C. Guy Yarvin
e04378b8fa
Merge branch 'master' into dillbo
...
Conflicts:
urb/urbit.pill
2015-03-19 11:55:58 -07:00
cgyarvin
41a9316b75
Merge pull request #264 from mrdomino/openbsd-getentropy
...
Use getentropy(2) on OpenBSD
2015-03-19 11:44:46 -07:00
Galen Wolfe-Pauly
da9dd15fe6
Merge branch 'master' into talk
2015-03-19 11:32:26 -07:00
Steven Dee
0308c9a00a
Use getentropy(2) on OpenBSD
2015-03-18 18:48:29 -04:00
C. Guy Yarvin
5732f8bd1a
:begin on cruiser works.
2015-03-18 15:01:47 -07:00
Philip C Monk
38d9504478
performance improvements
2015-03-18 17:25:01 -04:00
C. Guy Yarvin
5e00372d40
Merge branch 'master' of https://github.com/urbit/urbit
2015-03-18 09:43:18 -07:00
C. Guy Yarvin
6257937fcc
Various fixes and improvements.
2015-03-18 09:40:40 -07:00
C. Guy Yarvin
f98eeda228
Adjust dill for forward compatibility.
2015-03-17 13:53:38 -07:00
C. Guy Yarvin
a1a6cc8ad3
Right before pill switch from dull to dill.
2015-03-17 10:56:54 -07:00
Philip C Monk
ff276ba88d
Merge branch 'master' of https://github.com/urbit/urbit
2015-03-12 16:24:55 -04:00
Philip C Monk
d7a5bae0e3
Merge remote-tracking branch 'origin/master' into typedclay
...
Conflicts:
urb/urbit.pill
2015-03-10 15:47:22 -04:00
Philip Monk
7afd51199f
Merge pull request #263 from mrdomino/pwd-cmd-not-var
...
Use pwd command, not PWD env var
2015-03-10 12:38:34 -07:00
Anton Dyudin
d11b55c879
%- stack trace annotation
2015-03-06 17:15:51 -08:00
Philip C Monk
13ed6bf6e7
first over-the-network typed merge
2015-03-06 16:07:34 -05:00
Steven Dee
c4b3e47e87
Use pwd command, not PWD env var
...
So, sometimes PWD isn't exported. Like if you're in some kind of
weird sudo login session or something.
I don't know. It was broken for me. This fixed it.
2015-03-05 21:00:51 -05:00
Philip C Monk
0eecbb466a
Merge remote-tracking branch 'origin/master' into typedclay
...
Conflicts:
urb/urbit.pill
urb/zod/arvo/eyre.hoon
urb/zod/arvo/hoon.hoon
urb/zod/arvo/zuse.hoon
urb/zod/main/app/poke/core.hook
urb/zod/main/app/reboot/core.hook
urb/zod/main/app/shell/core.hook
urb/zod/main/app/tree/core.hook
2015-03-05 18:27:07 -05:00
C. Guy Yarvin
2ddd377f89
Merge branch 'master' into dillbo
...
Conflicts:
urb/urbit.pill
2015-03-05 13:31:35 -08:00
