Merge branch 'test' of https://github.com/urbit/urbit into test

This commit is contained in:
johncburnham 2014-08-21 14:18:03 -07:00
commit f1ae7e4594
45 changed files with 4 additions and 4 deletions

View File

@ -415,7 +415,7 @@
0w0 :: 244, ~byr, Tlon (gleba)
0w0 :: 245, ~sen, Tlon (gleba)
0w0 :: 246, ~weg, Tlon (gleba)
0w0 :: 247, ~fyr, Anton Dyudin (aestas)
0wU.VWcJa.TR1rQ.ONSCN.Mi5TW :: 247, ~fyr, Anton Dyudin (aestas)
0w0 :: 248, ~mur, Tlon (gleba)
0w0 :: 249, ~tel, Tlon (gleba)
0w0 :: 250, ~rep, Tlon (gleba)
@ -439,7 +439,7 @@
vix=(bex +((cut 0 [25 2] mag))) :: width of sender
tay=(cut 0 [27 5] mag) :: message type
==
?> =(1 vez)
?> =(2 vez)
?> =(chk (end 0 20 (mug bod)))
:+ [(end 3 wix bod) (cut 3 [wix vix] bod)]
(kins tay)
@ -459,7 +459,7 @@
=+ tay=(ksin q.kec)
%+ mix
%+ can 0
:~ [3 1]
:~ [3 2]
[20 (mug bod)]
[2 yax]
[2 qax]
@ -1047,7 +1047,7 @@
++ gnaw :: gnaw:am
|= [kay=cape ryn=lane pac=rock] :: process packet
^- [p=(list boon) q=fort]
?. =(1 (end 0 3 pac)) [~ fox]
?. =(2 (end 0 3 pac)) [~ fox]
=+ kec=(bite pac)
?: (goop p.p.kec) [~ fox]
?. (~(has by urb.ton.fox) q.p.kec)