urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-15 04:22:48 +03:00
Code Issues Packages Projects Releases Wiki Activity
768 Commits 768 Branches 10 Tags 215 MiB
864c4f01c7
Commit Graph

768 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
C. Guy Yarvin
3def0bca05 Merge branch 'master' of github.com:urbit/urbit 2014-06-03 10:46:02 -07:00
Jared Hance
1585ca9581 Merge branch 'newbreach' 
Conflicts:
	urb/urbit.pill
 2014-06-03 13:38:33 -04:00
James Torre
5b650b7ad0 Merge branch 'master' of https://github.com/urbit/urbit 2014-06-03 15:55:59 +00:00
Jared Hance
7cc45edad5 Add div:rd, div:fl, and jet. 
Also fix rnd:fl (by fixing rne:fl).
 2014-06-03 11:41:25 -04:00
C. Guy Yarvin
d57b87d94a Some vane cleanups, etc. 2014-06-02 22:07:32 -07:00
Jared Hance
f50d3322b3 Jet sub:rd. 2014-06-02 15:13:58 -04:00
Gavin Whelan
4c8db08588 Merge branch 'master' of https://github.com/urbit/urbit 2014-06-02 15:09:42 -04:00
Luke Patmore
57d45a25bd Actually added co.c 2014-06-02 12:09:19 -07:00
Gavin Whelan
6f59009632 Merge branch 'master' of https://github.com/urbit/urbit 
This commit is broken, but I needed to merge before pulling in the fix

Conflicts:
	urb/urbit.pill
 2014-06-02 14:56:27 -04:00
Luke Patmore
a97db340ce Added jet linkage for co_emco, co_oxco, and co_roco. Added templates for co jets. 2014-06-02 11:48:16 -07:00
Jared Hance
87427ef46f Jet add:rd. 
Also fix some rounding in add:fl that was found through jet test mode.
 2014-06-02 12:43:26 -04:00
Jared Hance
83127a0846 Merge branch 'newbreach' into ieee 
Conflicts:
	urb/urbit.pill
 2014-06-02 11:07:57 -04:00
Jared Hance
9d837c55fb Jet mul:rd. 
Running in test mode for now.
 2014-06-02 11:03:48 -04:00
Gavin Whelan
94c3eef12f Merge branch 'master' of https://github.com/urbit/urbit 2014-06-02 09:19:06 -04:00
~hatteb-mitlyd
b76b207bd2 fix booting without checkpoint 2014-06-01 22:24:50 -07:00
John Dulin
1d5ccdd5d2 Merge branch 'master' of https://github.com/urbit/urbit 2014-06-01 18:31:41 -07:00
C. Guy Yarvin
006335cfb9 Merge branch 'master' of github.com:urbit/urbit 2014-06-01 14:07:38 -07:00
~hatteb-mitlyd
dd0104dbce Add basic synclog code to try and track sync issues 2014-05-31 20:26:18 -07:00
~hatteb-mitlyd
c819b4c034 Merge remote-tracking branch 'origin/newbreach' 
Update protocol for breach.

Conflicts:
	f/trac.c
	urb/urbit.pill
	urb/zod/arvo/zuse.hoon
	v/raft.c
 2014-05-30 17:56:12 -07:00
Gavin Whelan
901c83799b Merge various changes 2014-05-30 16:13:44 -07:00
Gavin Whelan
9933bca9cf Merge and minor merge changes 2014-05-30 15:59:58 -07:00
~hatteb-mitlyd
b04775c002 remove old boot cruft 2014-05-30 15:05:47 -07:00
C. Guy Yarvin
8327419b78 Revert "Remove unused arms from arvo external core." 
This reverts commit b754c2aeadbc8028a2e7989066dbbf08d2f293ef.
 2014-05-30 14:51:28 -07:00
C. Guy Yarvin
4cbb1eeb18 Remove unused arms from arvo external core. 2014-05-30 14:45:41 -07:00
C. Guy Yarvin
c5513510f0 Slow things commented out. 2014-05-30 13:57:49 -07:00
Gavin Whelan
97637ebe78 Merging clay fixes 2014-05-30 13:36:51 -07:00
C. Guy Yarvin
534e1a9090 Perfect GHETTO. 2014-05-30 12:47:47 -07:00
C. Guy Yarvin
bb4696d9aa Only the GHETTO can save the GHETTO. 2014-05-30 12:05:03 -07:00
C. Guy Yarvin
93bd99a4d2 GHETTO. 2014-05-30 11:44:08 -07:00
C. Guy Yarvin
f4e45a67ab GHETTO. 2014-05-30 11:43:48 -07:00
~hatteb-mitlyd
f97058f0b8 more profiling detritus 
Conflicts:
	v/raft.c
 2014-05-30 11:42:49 -07:00
~hatteb-mitlyd
b23c701c2a more profiling detritus 2014-05-30 11:09:47 -07:00
Galen Wolfe-Pauly
695e7beee9 trivial merge 2014-05-29 18:59:08 -07:00
Gavin Whelan
eb4bd3c6cc Merge 2014-05-29 12:33:46 -07:00
Gavin Whelan
57cb5c1bb4 Merge 2014-05-29 12:29:55 -07:00
~hatteb-mitlyd
3566984894 crappy punk-perf 2014-05-29 12:19:55 -07:00
Gavin Whelan
0b3bd33aa4 Merging 2014-05-29 11:52:49 -07:00
C. Guy Yarvin
34733fc746 Merge branch 'newbreach' of github.com:urbit/urbit into newbreach 2014-05-28 16:43:43 -07:00
Gavin Whelan
13686b7780 Merge changes 2014-05-28 16:34:05 -07:00
Luke Patmore
a9cb6bd2a0 Merge branch 'newbreach' of https://github.com/urbit/urbit into newbreach 2014-05-28 15:41:23 -07:00
Luke Patmore
ff83b2c398 Trivial comment fix. 2014-05-28 15:40:21 -07:00
C. Guy Yarvin
9bebf1710c Merge branch 'newbreach' of github.com:urbit/urbit into newbreach 
Conflicts:
	urb/urbit.pill
 2014-05-28 15:28:13 -07:00
~hatteb-mitlyd
b0b0f817f5 Don't assert in moog 2014-05-28 15:23:35 -07:00
Gavin Whelan
50dba76ac1 Lore to crash on 0 2014-05-28 13:19:49 -07:00
Luke Patmore
d7e84e24cd Fixed scag jet, still disabled pending testing. 2014-05-28 12:44:20 -07:00
Gavin Whelan
356ffde15e Merge & new pill 2014-05-28 12:37:04 -07:00
Gavin Whelan
3d2cc3027d Merging merge 2014-05-28 12:26:16 -07:00
C. Guy Yarvin
8b085f0923 Disable scag jet. 2014-05-28 09:35:38 -07:00
C. Guy Yarvin
b1ef072836 Merge branch 'newbreach' of github.com:urbit/urbit into newbreach 
Conflicts:
	urb/urbit.pill
 2014-05-27 22:45:37 -07:00
Luke Patmore
23bf5cb4f7 Added jet for scag. 2014-05-27 10:02:37 -07:00