Merge branch 'nextbreach' of github.com:urbit/urbit into nextbreach

Conflicts:
	urb/urbit.pill
	urb/zod/arvo/hoon.hoon
This commit is contained in:
C. Guy Yarvin 2014-06-07 19:56:38 -07:00
commit 71caca2856

View File

@ -584,7 +584,7 @@
return u2_bc(wir_r, u2_rx(wir_r, gen), u2_nul);
}
else switch ( u2_h(gen) ) {
default: return u2_bl_error(wir_r, "rake-gene");
default: return u2_bl_error(wir_r, "rake-twig");
case u2_nul: return u2_bc(wir_r, u2_rx(wir_r, gen), u2_nul);