Commit Graph

6 Commits

Author SHA1 Message Date
Steve Dee
d7e4c46150 Revert "Revert "Merge remote-tracking branch 'urbit/master' into master""
This reverts commit dc6f72fa0a8ff2097b1e9c900ebec444c0d4c24f.
2014-02-25 12:18:07 -08:00
Steve Dee
de5048e895 Revert "Merge remote-tracking branch 'urbit/master' into master"
This reverts commit d52d2835b96f89e7ebbe5392c99f1483d165ee0b, reversing
changes made to 58838ea246e52c064719edc56e29b6a1ba713fdf.

Conflicts:
	Makefile
2014-02-24 11:27:57 -08:00
Steve Dee
27b50018a4 More loop -> raft, add u2_raft_boot 2014-02-12 17:27:09 -08:00
Steven Dee
f2a839426b Ye olde whitespace cleanup part 2
sed -i, glanced at.
2013-12-18 13:17:47 -08:00
C. Guy Yarvin
f592b16a59 Combat wake loops. 2013-11-20 22:43:12 -08:00
Christian Carter
3af3130bdc Cleaning up old code 2013-09-28 13:21:18 -07:00