Merge commit '7fddd' into cc-merge

This commit is contained in:
C. Guy Yarvin 2016-11-13 15:22:40 -08:00
commit e141749b4d
2 changed files with 7 additions and 6 deletions

View File

@ -143,11 +143,11 @@
(se-diff gyl fec) (se-diff gyl fec)
:: ::
++ peer :: ++ peer ::
|= pax/path =< se-abet |= pax/path
^+ +>
~| [%drum-unauthorized our+our src+src] :: ourself ~| [%drum-unauthorized our+our src+src] :: ourself
?> (team:title:jael our src) :: or our own moon ?> (team:title:jael our src) :: or our own moon
se-view:(se-text "[{<src>}, driving {<our>}]") =< se-abet =< se-view
(se-text "[{<src>}, driving {<our>}]")
:: ::
++ poke-dill-belt :: ++ poke-dill-belt ::
|= bet/dill-belt:^dill |= bet/dill-belt:^dill
@ -191,8 +191,9 @@
?~ saw +> ?~ saw +>
=+ gyl=(drum-phat way) =+ gyl=(drum-phat way)
?: (se-aint gyl) +>.$ ?: (se-aint gyl) +>.$
=. u.saw :_(u.saw >[%drum-coup-fail src ost gyl]<) %- se-dump:(se-drop & gyl)
(se-dump:(se-drop & gyl) u.saw) :_ u.saw
>[%drum-coup-fail src ost gyl]<
:: ::
++ take-onto :: ++ take-onto ::
|= {way/wire saw/(each suss:^gall tang)} |= {way/wire saw/(each suss:^gall tang)}