Commit Graph

797 Commits

Author SHA1 Message Date
C. Guy Yarvin
62c405543f Merge branch 'master' of github.com:urbit/urbit 2014-07-25 09:02:51 -07:00
C. Guy Yarvin
f9f538a9bc Fix a typo. 2014-07-25 09:02:32 -07:00
C. Guy Yarvin
1ae027d6cf Ford compiles - still needs some syntax. 2014-07-24 13:29:16 -07:00
C. Guy Yarvin
791a14d655 Merge branch 'master' of github.com:urbit/urbit 2014-07-24 11:16:50 -07:00
C. Guy Yarvin
331947db7a Code complete on ford. 2014-07-23 16:23:53 -07:00
C. Guy Yarvin
14b6f2dea7 Merge branch 'master' of github.com:urbit/urbit
Conflicts:
	urb/urbit.pill
2014-07-21 15:54:29 -07:00
Galen Wolfe-Pauly
218bd25471 Merge branch 'master' of https://github.com/urbit/urbit 2014-07-21 11:42:07 -07:00
John Dulin
5029579e0e Merge branch 'master' of https://github.com/urbit/urbit 2014-07-20 23:19:05 -07:00
C. Guy Yarvin
78094fec66 Merge branch 'master' of github.com:urbit/urbit 2014-07-18 17:51:37 -07:00
pcmonk
6a693a398c Merge branch 'eyre-stuff'
Conflicts:
	urb/urbit.pill
2014-07-17 16:16:28 -07:00
C. Guy Yarvin
e308ced2d8 Merge branch 'master' of github.com:urbit/urbit
Conflicts:
	urb/urbit.pill
2014-07-16 11:56:15 -07:00
C. Guy Yarvin
47694371b8 Minor tweaks. 2014-07-16 11:54:53 -07:00
Jared Hance
2241d0011b Merge branch 'clay'
Conflicts:
	urb/urbit.pill
2014-07-16 13:56:34 -04:00
Jared Hance
e547b32554 Fix crash due to the change in %clay storage model 2014-07-10 09:49:59 -04:00
pcmonk
4ace669911 raft fix (maybe) 2014-07-09 18:08:55 -07:00
C. Guy Yarvin
f1690271d6 Merge branch 'master' of github.com:urbit/urbit
Conflicts:
	urb/urbit.pill
2014-07-09 17:17:07 -07:00
pcmonk
6aecfd63b0 Merge branch 'master' of https://github.com/urbit/urbit 2014-07-09 15:59:44 -07:00
pcmonk
8bff7350aa removed stale %send handling 2014-07-09 15:59:22 -07:00
pcmonk
e23b389f77 Merge branch 'master' of https://github.com/urbit/urbit
Conflicts:
	urb/urbit.pill
2014-07-09 14:44:54 -07:00
pcmonk
c4b8f78afb %send effect does not need to drop through anymore 2014-07-09 14:42:08 -07:00
C. Guy Yarvin
ca74096463 Merge branch 'master' of github.com:urbit/urbit
Conflicts:
	urb/urbit.pill
2014-07-09 00:40:19 -07:00
pcmonk
ab31140f55 Fixed lag bug 2014-07-08 20:20:38 -07:00
C. Guy Yarvin
e66bd77bfe Merge branch 'master' of github.com:urbit/urbit 2014-07-05 14:27:08 -07:00
C. Guy Yarvin
75e61cf916 Various fixes and improvements. 2014-07-05 14:26:35 -07:00
C. Guy Yarvin
7dc457df4e Merge branch 'master' of github.com:urbit/urbit
Conflicts:
	urb/urbit.pill
2014-07-03 13:06:52 -07:00
~hatteb-mitlyd
258a1142de fix infelicities in sync 2014-07-03 11:44:14 -07:00
~hatteb-mitlyd
b44797d0d2 undo noisy sync stuff, fix bad string compare leading to disastrous sync 2014-07-01 17:18:56 -07:00
Anton Dyudin
b9689a17e1 Merge branch 'master' of https://github.com/urbit/urbit 2014-07-01 16:30:30 -07:00
C. Guy Yarvin
864c4f01c7 Change ++ja to ++jo and fix some stuff. 2014-07-01 16:29:44 -07:00
Anton Dyudin
2e71572eeb Merge branch 'master' of https://github.com/urbit/urbit 2014-07-01 15:51:47 -07:00
C. Guy Yarvin
16a21e19f4 Merge branch 'master' of github.com:urbit/urbit 2014-07-01 13:35:36 -07:00
C. Guy Yarvin
8298dd9404 Merge branch 'master' of github.com:urbit/urbit
Conflicts:
	urb/urbit.pill
2014-07-01 13:34:06 -07:00
C. Guy Yarvin
e8d7ead9ba Various fixes and improvements. 2014-06-30 18:15:56 -07:00
Anton Dyudin
88fca6f98d Merge branch 'master' of https://github.com/urbit/urbit
Conflicts:
	urb/zod/arvo/hoon.hoon
2014-06-30 13:09:16 -07:00
Jared Hance
bed7ddbb08 Fl Pt works.
The only failure I can get in the test suite is that signalling nan'n
crash it, which is expected behavior anyway.

Enables sse3 and fast-math.
2014-06-30 14:43:06 -04:00
Jared Hance
bf1978bc3b More floating point bugfixes.
Also enable FTZ, a SSE instruction... For now at least.
2014-06-30 12:24:32 -04:00
C. Guy Yarvin
4646930237 Merge branch 'master' of github.com:urbit/urbit
Conflicts:
	urb/urbit.pill
2014-06-29 20:03:15 -07:00
C. Guy Yarvin
5eb3c4e1dd %gall over %ames, first cut. 2014-06-29 16:58:17 -07:00
C. Guy Yarvin
510af17360 Merge branch 'master' of github.com:urbit/urbit 2014-06-27 10:52:42 -07:00
C. Guy Yarvin
b2cabcc281 Trailing whitespace and stuff. 2014-06-26 21:02:05 -07:00
~hatteb-mitlyd
b3b2f40893 Merge remote-tracking branch 'origin/soqdoqblok'
Conflicts:
	urb/urbit.pill
	urb/zod/arvo/zuse.hoon
2014-06-26 12:51:01 -07:00
C. Guy Yarvin
9e1ab06308 Merge branch 'master' of github.com:urbit/urbit
Conflicts:
	urb/urbit.pill
2014-06-26 05:26:44 -07:00
C. Guy Yarvin
e21d615beb %ames to %gall as /q/gm/[app]/[logo]. 2014-06-26 05:18:30 -07:00
~hatteb-mitlyd
84bbaa3b7a Merge remote-tracking branch 'urbit/newnextbreach'
redo pill to accept changes

Conflicts:
	urb/urbit.pill
2014-06-25 15:03:25 -07:00
C. Guy Yarvin
1f465d90a6 Small but important fixes. 2014-06-25 14:59:22 -07:00
~hatteb-mitlyd
c4d01192dc Merge remote-tracking branch 'urbit/newnextbreach'
this obsoletes newnextbreach, nextbreach, newbreach, et cetera.

Conflicts:
	gen164/4/in.c
	urb/zod/arvo/hoon.hoon
2014-06-25 13:39:48 -07:00
C. Guy Yarvin
4ad26b7c7c Merge branch 'newnextbreach' of github.com:urbit/urbit into newnextbreach
Conflicts:
	urb/urbit.pill
2014-06-25 12:20:33 -07:00
Jared Hance
2fe28632ca Merge branch 'nextbreach' into newnextbreach
Conflicts:
	urb/urbit.pill
2014-06-25 11:23:49 -04:00
C. Guy Yarvin
c0692b7a5c Various fixes and improvements. 2014-06-24 10:32:59 -07:00
C. Guy Yarvin
816d9acb75 Various fixes and improvements. 2014-06-19 11:53:16 -07:00