Commit Graph

28 Commits

Author SHA1 Message Date
Ubuntu
205276c17e Revert "Minor changes to update..."
This reverts commit de0d03a1921391a17aa27afd15a027615b29a020.
2014-08-06 02:49:07 +00:00
Jared Hance
aca0aaf5a6 Minor changes to update... 2014-08-05 11:18:05 -04:00
Jared Hance
4e9d9b44cf Add zapcols 2014-08-01 14:11:46 -04:00
Jared Hance
21034aa855 Various fixes, including timers 2014-08-01 10:54:31 -04:00
Jared Hance
ef94352267 Merge branch 'master' into klay
Conflicts:
	urb/urbit.pill
2014-07-29 13:25:18 -04:00
Jared Hance
dbb5995c9d Trivial fixes 2014-07-28 10:25:07 -04:00
Jared Hance
3a48876a4d Fix referential transparency in %cu 2014-07-25 13:44:06 -04:00
Jared Hance
667ad45403 Semi-working merges. 2014-07-24 15:21:58 -04:00
Jared Hance
fb24594e9e Can boot subs now! 2014-07-24 11:11:40 -04:00
Anton Dyudin
d4cd1cdb47 :update "merge method" clarification 2014-07-23 15:36:10 -07:00
Jared Hance
07998df9e1 Add ++niku to ++saba. 2014-07-10 10:38:53 -04:00
Gavin Whelan
eeb1591fb6 Minor changes 2014-06-07 13:42:48 -04:00
Gavin Whelan
376e1079d4 Removed printout and improved :update 2014-06-02 14:41:53 -04:00
Gavin Whelan
7eea04ce1e Minor interface changes 2014-05-31 14:11:11 -07:00
Gavin Whelan
6177ebbb26 Merge and minor merge changes 2014-05-30 15:59:58 -07:00
Gavin Whelan
a242cea2b2 Merging merge 2014-05-28 12:26:16 -07:00
C. Guy Yarvin
6683b4d24d No comment in update. 2013-12-29 17:30:09 -05:00
C. Guy Yarvin
214b56db2c Update still needs batz est bug fix. 2013-12-29 17:27:44 -05:00
C. Guy Yarvin
de9bf707d2 Properly hacked :update. 2013-12-29 02:05:16 -05:00
C. Guy Yarvin
691ee29622 Update broken again. 2013-12-29 01:58:54 -05:00
C. Guy Yarvin
dd67e19863 woops, update was gebroken 2013-12-29 01:57:14 -05:00
C. Guy Yarvin
92aaf45cb4 Remove debug. Add ~s5 lag in update to deal with skew bug. 2013-12-29 01:55:19 -05:00
C. Guy Yarvin
548b9f445a Debug. 2013-12-28 22:51:15 -05:00
C. Guy Yarvin
6fd2a8c841 Better debug. 2013-12-28 22:50:27 -05:00
C. Guy Yarvin
13e63a1db1 More printfs in update. 2013-12-28 22:48:22 -05:00
Steven Dee
4025898428 Ye olde whitespace cleanup
Run using
  find . -type f | xargs sed -i '\s\+$'

And not even glanced at. It's fine. Don't worry about it.
2013-12-08 21:23:03 +00:00
C. Guy Yarvin
4de22868bb Development "branch" goes back to production. 2013-10-06 00:44:07 -07:00
Christian Carter
4caa90c68f Cleaning up old code 2013-09-28 13:21:18 -07:00