Commit Graph

6071 Commits

Author SHA1 Message Date
Anton Dyudin
2576756f32 Merge branch 'eyre-links' into cc-mergeful 2016-11-16 13:45:40 -08:00
Anton Dyudin
eafafab9fc add <a href="x-urbit:/path..." /> to error trace
Disabled by default
2016-11-16 13:45:27 -08:00
Anton Dyudin
6ebe0ca212 split role-tape out of ++wush 2016-11-16 12:22:09 -08:00
Anton Dyudin
fe31213d13 Revert "hacks: init jael on boot"
This reverts commit 12fc5e6cf3.
2016-11-15 10:55:29 -08:00
Anton Dyudin
530beef96b Merge branch 'cc-release' into cc-merge
Conflicts:
	arvo/eyre.hoon
2016-11-14 14:04:46 -08:00
Anton Dyudin
13bc8ea59f Merge branch 'jaelwomb' into cc-release 2016-11-14 12:49:19 -08:00
C. Guy Yarvin
b3e98f47e4 Merge commit '219e587' into cc-merge 2016-11-13 19:40:35 -08:00
C. Guy Yarvin
0b0618894b Merge commit 'aeced' into cc-merge 2016-11-13 19:40:27 -08:00
C. Guy Yarvin
e1f22dafd4 Merge commit '55094b' into cc-merge 2016-11-13 19:40:20 -08:00
C. Guy Yarvin
e3d191c314 Merge commit '1dbb57' into cc-merge 2016-11-13 19:40:11 -08:00
C. Guy Yarvin
ab2deb568e Merge commit '75c726' into cc-merge 2016-11-13 19:39:58 -08:00
C. Guy Yarvin
257e5189df Merge commit 'b34442' into cc-merge 2016-11-13 19:39:34 -08:00
C. Guy Yarvin
e36803df88 Merge commit '20c6d8c' into cc-merge 2016-11-13 19:39:12 -08:00
C. Guy Yarvin
696edafb33 Merge commit 'a7348' into cc-merge 2016-11-13 19:39:05 -08:00
C. Guy Yarvin
bb2c947c01 Merge commit '196d32' into cc-merge 2016-11-13 19:38:57 -08:00
C. Guy Yarvin
84b993c3a3 Merge commit 'b98362' into cc-merge 2016-11-13 19:38:46 -08:00
C. Guy Yarvin
bd11063983 Merge commit '1754f' into cc-merge 2016-11-13 19:38:10 -08:00
C. Guy Yarvin
364717f141 Merge commit '790315' into cc-merge 2016-11-13 19:37:33 -08:00
C. Guy Yarvin
58a0d104ff Merge commit 'bf54034' into cc-merge 2016-11-13 19:35:40 -08:00
C. Guy Yarvin
7236b102d2 Merge commit 'd6c556' into cc-merge 2016-11-13 19:34:30 -08:00
C. Guy Yarvin
3c344804bd Merge commit '6d5aa' into cc-merge 2016-11-13 19:34:11 -08:00
C. Guy Yarvin
da65819899 Merge commit '1fead84' into cc-merge 2016-11-13 19:22:25 -08:00
C. Guy Yarvin
3551848d08 Merge commit '0c8f77d' into cc-merge 2016-11-13 19:15:19 -08:00
C. Guy Yarvin
3a7c262232 Merge commit 'c68f61' into cc-merge 2016-11-13 18:56:39 -08:00
C. Guy Yarvin
653d27531a Merge commit 'f53ac' into cc-merge 2016-11-13 18:56:31 -08:00
C. Guy Yarvin
d0351a3e27 Merge commit '7042c26' into cc-merge 2016-11-13 18:56:23 -08:00
C. Guy Yarvin
73340dd5c6 Merge commit '7201e' into cc-merge 2016-11-13 18:55:13 -08:00
C. Guy Yarvin
0b17fc9073 Merge commit '3f56d2' into cc-merge 2016-11-13 18:55:06 -08:00
C. Guy Yarvin
b219f875ba Merge commit '7ab3b' into cc-merge 2016-11-13 18:54:58 -08:00
C. Guy Yarvin
cbbbef32cc Merge commit 'ed1525' into cc-merge 2016-11-13 18:54:06 -08:00
C. Guy Yarvin
e4048f9829 Merge commit 'f926c' into cc-merge 2016-11-13 18:52:59 -08:00
C. Guy Yarvin
3a4c28726d Merge commit 'b11f92' into cc-merge 2016-11-13 18:52:45 -08:00
C. Guy Yarvin
387fc7d63f Merge commit 'e993076' into cc-merge 2016-11-13 18:52:36 -08:00
C. Guy Yarvin
c242292e91 Merge commit 'b67f5b' into cc-merge 2016-11-13 18:52:28 -08:00
C. Guy Yarvin
fed0d3e6b3 Merge commit 'f66a802' into cc-merge 2016-11-13 18:52:19 -08:00
C. Guy Yarvin
1456c0eaac Merge commit '0ec2dd' into cc-merge 2016-11-13 18:52:05 -08:00
C. Guy Yarvin
8a6b77149c Merge commit 'd0153' into cc-merge 2016-11-13 18:51:57 -08:00
C. Guy Yarvin
073b41f740 Merge commit '1b82e' into cc-merge 2016-11-13 18:51:39 -08:00
C. Guy Yarvin
ba22c9b86d Merge commit 'f252988' into cc-merge 2016-11-13 18:51:21 -08:00
C. Guy Yarvin
9a63098094 Merge commit 'f93f5dd' into cc-merge 2016-11-13 18:35:16 -08:00
C. Guy Yarvin
1b20c4530c Merge commit 'd93b105' into cc-merge 2016-11-13 18:35:02 -08:00
C. Guy Yarvin
8c58e89e6f Merge commit '90aa39057' into cc-merge 2016-11-13 18:34:55 -08:00
C. Guy Yarvin
d1c0cd28db Merge commit '8275335' into cc-merge 2016-11-13 18:34:43 -08:00
C. Guy Yarvin
c1cd2c4efe Merge commit 'b9871' into cc-merge 2016-11-13 18:34:01 -08:00
C. Guy Yarvin
55af1d5c19 Merge commit 'ce1ec' into cc-merge 2016-11-13 18:33:31 -08:00
C. Guy Yarvin
cb12ed9085 Merge commit '4bae655' into cc-merge 2016-11-13 18:32:26 -08:00
C. Guy Yarvin
d3e06e1103 Merge commit '7e06f4' into cc-merge 2016-11-13 18:27:13 -08:00
C. Guy Yarvin
a99ad2c2a5 Merge commit '5e3b34' into cc-merge 2016-11-13 18:21:34 -08:00
C. Guy Yarvin
60dd0f3e95 Merge commit '8f7d7b' into cc-merge 2016-11-13 18:21:16 -08:00
C. Guy Yarvin
916e6f5bf1 Merge commit 'a819b' into cc-merge 2016-11-13 18:21:05 -08:00