Merge branch 'cabmold' into cabdone

Conflicts:
	urb/urbit.pill
	urb/zod/arvo/hoon.hoon
This commit is contained in:
C. Guy Yarvin 2015-12-03 11:44:01 -08:00
commit dd8f810189

View File

@ -7003,7 +7003,7 @@
==
::
[%cbpm *] [%bush boil(gen p.gen) boil(gen q.gen)]
[%cbls *] [%weed [%brts [%herb p.gen] [%bctr %herb q.gen]]]
[%cbls *] [%weed [%brls [%herb p.gen] [%bctr %herb q.gen]]]
[%cbts *] [%bark p.gen boil(gen q.gen)]
[%cbwt *] =+ (turn p.gen |=(a=twig boil(gen a)))
?~(- [%axil %void] [%fern -])