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

Conflicts:
	urb/urbit.pill
This commit is contained in:
C. Guy Yarvin 2014-12-09 11:14:59 -08:00
commit 26e5692f90
3 changed files with 2 additions and 4 deletions

View File

@ -64,7 +64,7 @@
%+ peach
;~((glue fas) ;~(pfix sig fed:ag) urs:ab)
%+ sear (soft partner)
;~((glue fas) sym (cook crip (star prn))) :: XX [a-z0-9_]+
;~((glue fas) sym (cook crip (star prn))) :: XX [a-z0-9_]{1,15}
::
++ stam
^- $+(json (unit statement))

View File

@ -23,7 +23,7 @@
%group %.(+.rep (jome phon stas))
==
++ joce |=(a=span [%s a])
++ jope |=(a=ship (jape +:<a>))
++ jope |=(a=ship [%s (crip +:(scow %p a))]
++ joke |=(a=tank [%s (role (turn (wash 0^80 a) crip))])
++ jode |=(a=time (jone (div (mul (sub a ~1970.1.1) 1.000) ~s1)))
:: ++ jase

View File

@ -8,8 +8,6 @@
[%publish (list thought)] :: originate
[%review (list thought)] :: deliver
[%ping (pair span presence)] :: declare status
:: ping:{room:"foo" presence:"hear"}
:: ping:["foo", "hear"]
== ::
++ config :: party configuration
$: sources=(set station) :: pulls from