Merge branch 'master' of github.com:urbit/urbit

This commit is contained in:
C. Guy Yarvin 2013-10-10 10:59:04 -07:00
commit 77dc70a764

View File

@ -1565,7 +1565,7 @@
==
::
%ye :: %ye
~& [%ye bon]
:: ~& [%ye bon]
?> =(p.p.bon (sein q.p.bon))
=+ ^= paz ^- (list ,@p)
%+ skim pals:(~(um am [now fox]) p.p.bon)
@ -1578,7 +1578,7 @@
[%want him /q/yu [q.p.bon r.bon]]
::
%yu :: %yu
~& [%yu bon]
:: ~& [%yu bon]
?. =(q.p.bon (sein p.p.bon)) [~ fox]
=+ dof=((hard ,[p=@p q=@t]) r.bon)
$(bon [%milk [p.p.bon p.dof] q.bon(q /q/hi) q.dof])