Commit Graph

15 Commits

Author SHA1 Message Date
Anton Dyudin
e874ce237a verified mark code 2016-02-17 15:00:12 -08:00
Raymond Pasco
309805f5e7 Merge in Hoon 151
Complicated merge of Hoon 151. This commit is a major sequence point.
2016-02-10 14:03:28 -05:00
Raymond Pasco
d5e097e82a Merge remote-tracking branch 'galenwp/factor'
Conflicts:
	urb/urbit.pill
	urb/zod/ape/bit.hoon
	urb/zod/arvo/eyre.hoon
	urb/zod/mar/hook.hoon
	urb/zod/pub/bit/fab/hymn.hook
	urb/zod/pub/docs/dev/hoon/principles/1-twigs.md
	urb/zod/pub/docs/dev/hoon/principles/2-syntax.md
	urb/zod/pub/docs/dev/hoon/reference/odors.md
	urb/zod/pub/docs/dev/hoon/reference/pronunciation.md
	urb/zod/pub/docs/dev/hoon/runes/sg/sgcn.md
	urb/zod/pub/docs/dev/hoon/runes/sm.md
	urb/zod/pub/docs/dev/hoon/runes/sm/smsg.md
	urb/zod/pub/docs/dev/hoon/runes/sm/smzz.md
	urb/zod/pub/docs/dev/hoon/runes/ts/tssg.md
	urb/zod/pub/docs/dev/hoon/runes/wt/wthz.md
	urb/zod/pub/docs/dev/hoon/runes/wt/wtls.md
	urb/zod/pub/docs/dev/hoon/runes/zp/zpzp.md
	urb/zod/pub/docs/theory/whitepaper.md
	urb/zod/pub/docs/user/appliance.md
	urb/zod/pub/docs/user/intro.md
	urb/zod/pub/docs/user/talk.md

Merged Galen and Anton's web refactoring work
2016-02-08 16:14:03 -08:00
Anton Dyudin
c05e96c62f fix hoon location header information 2016-02-04 19:05:37 -08:00
C. Guy Yarvin
049f1defb2 151 merge is double solid. 2016-01-31 22:16:26 -08:00
C. Guy Yarvin
25d791e2a4 Merge remote-tracking branch 'upstream/master' into newdeal 2016-01-31 20:37:49 -08:00
Anton Dyudin
d1e6db156d Merge branch 'eyre-root-beam' into ford-ren - requested for glen/factor merge 2016-01-29 14:41:19 -08:00
Philip C Monk
0f0d08356c fix marks for new lore/role 2016-01-13 16:19:09 -05:00
C. Guy Yarvin
860dff2d26 Convert + to / in codebase. 2015-12-20 12:50:45 -08:00
C. Guy Yarvin
53b1351836 Mostly detoxified rogue %ktts. 2015-12-12 18:51:23 -08:00
C. Guy Yarvin
8d8d81cbf9 Cleaned up some marks. 2015-12-09 20:05:58 -08:00
Anton Dyudin
f6b1a6779a tree edit mode button, read-only mime source view 2015-12-08 18:25:51 -08:00
Anton Dyudin
0994ad1976 /pub -> /web, mostly 2015-12-07 12:57:38 -08:00
Anton Dyudin
96b2f9d814 atomized mark ++grad 2015-07-07 15:22:32 -07:00
Philip C Monk
72ef5c2cbd urb/zod/base -> urb/zod 2015-06-19 17:16:48 -04:00