Steve Dee a0e835ecd8 Merge branch 'master' into newbreach ... Took master's pill. Conflicts: Makefile urb/urbit.pill		2014-04-16 10:53:50 -07:00
..
1	Last checkin on funbreach.	2014-01-06 12:37:42 -08:00
2	Last checkin on funbreach.	2014-01-06 12:37:42 -08:00
3	Fixed a bug in jet for dis causing undeterministic behaivor.	2014-04-02 16:35:02 -07:00
4	Bring map union and shal jets live	2014-04-15 17:33:22 -07:00
5	Merge branch 'master' into newbreach	2014-04-16 10:53:50 -07:00
6	Template language.	2014-04-02 18:06:45 -07:00
pit.h	Last checkin on funbreach.	2014-01-06 12:37:42 -08:00
watt.c	sort-of fix jets for Ed25519	2014-04-11 17:17:39 -07:00