Commit Graph

1607 Commits

Author SHA1 Message Date
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
C. Guy Yarvin
4eefaeb953 Start dojo. 2015-03-05 13:25:08 -08:00
Philip C Monk
3437100bbb progress toward sub-booting 2015-03-04 19:36:29 -05:00
Philip C Monk
b248466526 Merge branch 'master' of https://github.com/urbit/urbit 2015-03-02 16:51:33 -05:00
Philip Monk
b74beae6c0 Merge pull request #261 from mrdomino/openbsd-fixes
Conditionally disable unused-result on OpenBSD
2015-03-02 13:47:40 -08:00
Steven Dee
21242e9c61 Conditionally disable unused-result on OpenBSD 2015-03-02 16:44:21 -05:00
Philip Monk
bbe0cc0971 Merge pull request #259 from mrdomino/openbsd-fixes
Fixes for OpenBSD build
2015-03-02 11:07:34 -08:00
Philip C Monk
8df018b0b0 fixed linux build 2015-03-02 14:06:36 -05:00
Steven Dee
63908d386e Fix linux build 2015-03-02 14:04:20 -05:00
Steven Dee
6173d1577c Fixes for OpenBSD build 2015-03-02 13:36:46 -05:00
Philip C Monk
cbcb62459a move along, nothing to see here 2015-02-27 01:35:41 -05:00
C. Guy Yarvin
a3a2ec2260 Basic dialog workings. 2015-02-25 08:57:43 -08:00
Anton Dyudin
34431f53e9 BTC base58check @uc odour v1 2015-02-24 18:10:11 -08:00
C. Guy Yarvin
21e3a0aee8 Recover a BUNCH of old stuff from a stash. 2015-02-24 15:31:58 -08:00
C. Guy Yarvin
597cfd11ca Barnaby, almost working. 2015-02-24 14:53:31 -08:00
C. Guy Yarvin
12d11b7781 Merge branch 'master' into dillbo
Conflicts:
	urb/urbit.pill
	urb/zod/arvo/ford.hoon
2015-02-24 11:01:26 -08:00
Galen Wolfe-Pauly
87691797a2 moved into doc desk 2015-02-23 15:28:09 -08:00
Anton Dyudin
479311153d de-DGHETTO 2015-02-20 13:50:30 -08:00
Anton Dyudin
9ff256099c Cached %bake 2015-02-20 13:42:57 -08:00
Anton Dyudin
aa1cfca2dd dbg wip 2015-02-19 21:27:23 -08:00
Anton Dyudin
62dbdc1b49 Merge branch 'master' into eyre-new
Conflicts:
	n/t.c
2015-02-19 19:59:03 -08:00