Commit Graph

16 Commits

Author SHA1 Message Date
C. Guy Yarvin
9bfc5674c3 Enable -q. 2015-05-19 17:04:08 -07:00
C. Guy Yarvin
225d211f01 You can now start with -v. 2015-05-19 11:56:44 -07:00
C. Guy Yarvin
5f6e3522ff Merge branch 'master' of https://github.com/urbit/urbit
Conflicts:
	urb/urbit.pill
2015-05-19 11:46:46 -07:00
C. Guy Yarvin
ad47ebec56 -T for autoboot. 2015-05-19 11:38:23 -07:00
Philip C Monk
31e80487a1 Merge branch 'master' into typedclay
Conflicts:
	n/t.c
	urb/urbit.pill
	urb/zod/main/app/reload/core.hook
	urb/zod/main/app/shell/core.hook
	urb/zod/main/app/solid/core.hook
	urb/zod/main/arvo/dill.hoon
	urb/zod/main/arvo/eyre.hoon
	urb/zod/main/arvo/ford.hoon
	urb/zod/main/arvo/gall.hoon
	urb/zod/main/arvo/hoon.hoon
	urb/zod/main/mar/json/door.hook
	urb/zod/main/mar/md/door.hook
	urb/zod/main/mar/txt/door.hook
	v/raft.c
	v/unix.c
2015-04-22 20:18:19 -04:00
Steven Dee
0308c9a00a Use getentropy(2) on OpenBSD 2015-03-18 18:48:29 -04: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
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
ce8afd76ee Various profiling and other fixes. 2014-11-30 16:06:08 -08:00
C. Guy Yarvin
b3a64933bc Ready to test profiling. 2014-11-28 18:19:11 -08:00
C. Guy Yarvin
60db57a48e Fix some stuff; comment out uni jets. 2014-11-19 16:46:16 -08:00
C. Guy Yarvin
dfbd88b7b9 Various fixes and improvements. 2014-11-15 17:10:15 -08:00
Philip C Monk
b1ca1c5322 Merge remote-tracking branch 'origin/test' into dish
Conflicts:
	i/v/vere.h
2014-11-06 17:04:57 -05:00
C. Guy Yarvin
a2ba265d99 Renaming, renaming. 2014-11-05 19:10:22 -08:00
C. Guy Yarvin
a7215257ac Some renamings and cleanups. 2014-11-05 13:54:52 -08:00