Commit Graph

10 Commits

Author SHA1 Message Date
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
Philip C Monk
cbcb62459a move along, nothing to see here 2015-02-27 01:35:41 -05:00
C. Guy Yarvin
597cfd11ca Barnaby, almost working. 2015-02-24 14:53:31 -08:00
C. Guy Yarvin
95fbf2915b Before experiment in reversing arvo moves. 2015-02-17 19:30:53 -08:00
C. Guy Yarvin
2c80dd5297 Reverse i search 2015-02-11 18:57:33 -08:00
C. Guy Yarvin
a3bb81f397 Check in some testing stuff. 2015-02-08 13:22:33 -08:00
Philip C Monk
cef42f4d21 clear terminal backlog in ++prep 2014-12-05 16:09:46 -05:00
Philip C Monk
451e652c40 half the markdown jet 2014-12-03 23:58:49 -05: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
a7215257ac Some renamings and cleanups. 2014-11-05 13:54:52 -08:00