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

Conflicts:
	urb/zod/main/bin/tach.hoon
This commit is contained in:
Curtis Yarvin 2013-11-04 18:24:27 +00:00
commit c55be7d9d5
2 changed files with 2 additions and 1 deletions

View File

@ -321,7 +321,7 @@
0w0 :: 210, ~rel
0w0 :: 211, ~rud
0w0 :: 212, ~nes
0w0 :: 213, ~hes
0w16.~8NZV.VyMmf.4toMO.pui1R :: 213, ~hes, Alex Moskalyuk (donum)
0w0 :: 214, ~fet
0w0 :: 215, ~des
0w0 :: 216, ~ret

View File

@ -27,6 +27,7 @@
(cold [%who ~] tis)
(stag %all (stag %& mess))
(stag %say ;~(plug ;~(pfix sig fed:ag) ;~(pfix ace mess)))
(stag %all (stag %& mess))
==
--
|%