Merge remote-tracking branch 'origin/test' into dish

Conflicts:
	i/v/vere.h
This commit is contained in:
Philip C Monk 2014-11-06 17:04:57 -05:00
commit ace87f20f4
2 changed files with 2 additions and 2 deletions

View File

@ -610,7 +610,7 @@
::
++ poxo :: node to tape
=< |=(a=manx `tape`(apex a ~))
|_ unq=?
|_ unq=_`?`|
++ apex :: top level
|= [mex=manx rez=tape]
^- tape

View File

@ -127,7 +127,7 @@
==
%- full
;~ pose
:~(plug (cook lent (stun [1 6] hax)) hed)
;~(plug (cook lent (stun [1 6] hax)) hed)
(stag 1 (ifix [wits ;~(plug eol (plus tis))] sed))
(stag 2 (ifix [wits ;~(plug eol (plus hep))] sed))
==