Merge branch 'baruch' into merge

Conflicts:
	Makefile		-- manually resolved
	compiler/schema.capnp	-- used from liamstask
	compiler/test.capnp	-- used from liamstask
This commit is contained in:
David Lamparter 2016-02-28 12:17:57 +01:00
commit 0ddba4f2f1
8 changed files with 235 additions and 54 deletions

View file

@ -14,7 +14,7 @@ static const uint8_t capn_buf[8168] = {
77,0,0,0,34,0,0,0,
77,0,0,0,26,0,0,0,
76,0,0,0,6,0,20,0,
205,207,62,235,24,0,0,0,
29,109,174,255,24,0,0,0,
33,1,0,0,41,0,0,0,
33,1,0,0,34,0,0,0,
33,1,0,0,35,0,0,0,
@ -390,7 +390,7 @@ static const uint8_t capn_buf[8168] = {
77,0,0,0,34,0,0,0,
77,0,0,0,26,0,0,0,
76,0,0,0,6,0,20,0,
237,201,62,235,24,0,0,0,
61,103,174,255,24,0,0,0,
33,1,0,0,41,0,0,0,
33,1,0,0,34,0,0,0,
33,1,0,0,35,0,0,0,
@ -685,7 +685,7 @@ static const uint8_t capn_buf[8168] = {
77,0,0,0,34,0,0,0,
77,0,0,0,26,0,0,0,
76,0,0,0,6,0,20,0,
81,197,62,235,24,0,0,0,
161,98,174,255,24,0,0,0,
33,1,0,0,41,0,0,0,
33,1,0,0,34,0,0,0,
33,1,0,0,35,0,0,0,