Merge remote-tracking branch 'urbit/master' into newbreach

Conflicts:
	urb/urbit.pill

Generated new pill.
This commit is contained in:
Steven Dee 2014-05-09 00:07:06 +00:00
commit 7265a29a6b

View File

@ -1741,12 +1741,7 @@
~/ %rub ~/ %rub
|= [a=@ b=@] |= [a=@ b=@]
^- [p=@ q=@] ^- [p=@ q=@]
=+ ^= c =+ c==+(c=0 |-(?.(=(0 (cut 0 [(add a c) 1] b)) c $(c +(c)))))
=+ [c=0 m=(met 0 b)]
|- ?< (gth c m)
?. =(0 (cut 0 [(add a c) 1] b))
c
$(c +(c))
?: =(0 c) ?: =(0 c)
[1 0] [1 0]
=+ d=(add a +(c)) =+ d=(add a +(c))