urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-16 06:51:14 +03:00
Code Issues Packages Projects Releases Wiki Activity
7,570 Commits 768 Branches 10 Tags 215 MiB
9520999b00
Commit Graph

843 Commits

Author SHA1 Message Date
C. Guy Yarvin
ab5fb62484 Various fixes and imprevements. 2017-10-22 15:46:07 -07:00
Fang
e990975c39 Some cleanup. /mar/talk/action now fully functional (but untested). 2017-10-20 19:46:02 +02:00
Fang
65ed4c9884 Fixed recursive reparsers to not dig: over. 2017-10-20 19:45:24 +02:00
Fang
b6df30e006 /mar/talk/action to json works. 
From json currently dig-overs.
 2017-10-20 17:42:07 +02:00
Fang
aff9d309b5 Merge branch 'master' of https://github.com/urbit/arvo into remaint-merge-talk 2017-10-20 12:15:14 +02:00
Ted Blackman
76d03eb394 Merge branch 'master' of github.com:belisarius222/arvo 2017-10-19 16:53:08 -07:00
C. Guy Yarvin
84f50dea0e Revert "Fixed compilation error in /lib/helm" 
This reverts commit 46d67620bf.
 2017-10-19 16:50:07 -07:00
Ted Blackman
267c87d651 partial fixes for gh app 2017-10-19 16:43:37 -07:00
Fang
4e089bd2ce Merge branch 'master' of https://github.com/urbit/arvo into remaint-merge-talk 2017-10-20 00:07:35 +02:00
Fang
46d67620bf Fixed compilation error in /lib/helm 2017-10-20 00:07:02 +02:00
Fang
e59b37eafc Merge branch 'master' of https://github.com/urbit/arvo into remaint-merge-talk 2017-10-19 23:59:14 +02:00
Fang
7d4e0512cf Largely complete /lib/talk-json (still missing diffs), /mar/talk/action. 2017-10-19 23:58:18 +02:00
C. Guy Yarvin
640632279f Merge branch 'master' of http://github.com/urbit/arvo 2017-10-19 10:37:09 -07:00
C. Guy Yarvin
8b727d48ca Fix |reset. 2017-10-19 10:36:53 -07:00
Fang
7fdcf344e3 Now using audience instead of (set circle) where appropriate. 2017-10-19 02:05:53 +02:00
Fang
3454c2e916 Reverted change that broke /lib/talk.hoon 2017-10-19 01:59:51 +02:00
Anton Dyudin
5018e466b8 fix frontend 2017-10-18 15:06:03 -07:00
Elliot Glaysher
c2b8d61fa2 insert -> put 2017-10-13 23:28:11 -07:00
Elliot Glaysher
22dca3032f Remove 'transform' and use 'map'. 2017-10-13 23:13:15 -07:00
Elliot Glaysher
5e2f544a13 Change the name of ++map to ++dict so 'map' can be used for 'transform'. 2017-10-13 23:09:01 -07:00
Fang
c14970c228 tmp progress on talk-json lib & marks 2017-10-12 12:30:16 +02:00
Fang
082ebfc8ae Misc cleanup 2017-10-12 12:29:56 +02:00
C. Guy Yarvin
5c3fd13cc9 Ticketing works. 2017-10-11 17:00:21 -07:00
Fang
d281627d4d Merge branch 'master' of https://github.com/urbit/arvo into remaint-merge-talk 2017-10-10 11:05:09 +02:00
C. Guy Yarvin
e0cb33b815 Fix some boot issues. 2017-10-09 22:22:47 -07:00
C. Guy Yarvin
068cbb34d9 Fix old-zuse lib; make hi failure work 2017-10-09 20:39:08 -07:00
Fang
0d72c1d2c4 Made range a first-class citizen of sources/subscriptions. 
FIXME side-effect: agent can't unsub from sources with specified ranges.
 2017-10-09 22:50:17 +02:00
Fang
6ea650efba Merge branch 'master' of https://github.com/urbit/arvo into remaint-merge-talk 2017-10-08 22:52:42 +02:00
Fang
ae72b8f10f Merge pull request #437 from joemfb/plan-serv-cc 
forwardport #436
 2017-10-07 13:31:28 +02:00
Joseph Bryan
e6f52193d5 writes web/plan to whichever desk has been |served 2017-10-06 19:59:28 -04:00
Joseph Bryan
94d6b3ccfa writes web/plan to whichever desk has been |served 2017-10-06 19:48:59 -04:00
Fang
5c7e045495 Talk files now compile. 
Guardian doesn't yet init properly.
 2017-10-06 19:35:25 +02:00
Fang
bb5150819c Merge branch 'talk-split' into remaint-merge-talk 
Uncompiled. Untested.

# Conflicts:
#	app/talk.hoon
#	lib/helm.hoon
#	lib/talk.hoon
#	mar/talk/command.hoon
#	mar/talk/report.hoon
#	mar/talk/telegrams.hoon
#	sur/talk.hoon
 2017-10-06 14:46:46 +02:00
Fang
5cf7e0971c Misc. cleanup, comments, ideas. 2017-10-06 13:29:15 +02:00
C. Guy Yarvin
f2a7257f8a Mostly merged. 2017-10-02 21:36:34 -07:00
C. Guy Yarvin
5a74064080 Merge branch 'remaint' into remaint-merge 2017-10-01 18:50:19 -07:00
Elliot Glaysher
7d46bccdfc Change the interface for random numbers. 2017-09-29 21:26:50 -07:00
Elliot Glaysher
08962cfd63 First quickcheck test. 
Test that the ++alter:mp family is a ++valid treap after a large number of
random actions.
 2017-09-28 23:05:23 -07:00
Elliot Glaysher
fc651af8aa Minor runtime fix to ++transform-maybe. 2017-09-27 23:23:12 -07:00
Elliot Glaysher
1157710c74 Fix the semantics and runtime of ++filter. 2017-09-27 23:10:45 -07:00
Elliot Glaysher
37f65c099d Inline ++to-list. 2017-09-27 22:08:40 -07:00
Elliot Glaysher
1d8614f2ee Don't repeat ++transform-either's implementation. 2017-09-27 21:55:35 -07:00
Elliot Glaysher
3b007e389c Fix the runtime of ++alter and family. 
Previous runtime was pretty nutty and walked the tree multiple times.
 2017-09-27 21:20:32 -07:00
Elliot Glaysher
0d2b14f4b7 Weld should work on differently typed lists. 2017-09-27 21:18:02 -07:00
Elliot Glaysher
843c902bf2 Remove most usage of , to strip faces. Use the face itself instead. 2017-09-25 23:25:58 -07:00
Elliot Glaysher
21926968ae Clean out lots of todos. 2017-09-25 15:54:41 -07:00
Elliot Glaysher
326b602aae Port new-hoon.hoon and tests to master. 2017-09-25 10:31:22 -07:00
C. Guy Yarvin
dc25979f59 Merge remote-tracking branch 'origin/master' into piaf-runes 2017-09-21 18:45:27 -07:00
C. Guy Yarvin
f8349b1aa7 Correct ^ conversion. 2017-09-19 17:35:45 -07:00
C. Guy Yarvin
bf3b8432b3 About working. But very slow. 2017-09-07 16:47:49 -07:00
Ted Blackman
62fec03d96 Fixed code block at start of blockquote 2017-08-29 18:05:44 -07:00
Anton Dyudin
6c271563ef <br/> from trailing \ 2017-08-28 17:52:18 -07:00
Anton Dyudin
e133564d38 add frontmatter parsing to .mdh 
pulling ++shut out of hoon/hoon since nothing will use it
 2017-08-28 16:42:44 -07:00
Ted Blackman
5ab0a794b1 Fix header in blockquote 2017-08-28 15:11:09 -07:00
Ted Blackman
6a05cf158c fixed list outdent parsing; moved list closing to ++line 2017-08-25 18:12:05 -07:00
Ted Blackman
1176fe0f3d consolidated outdent parsing 2017-08-25 17:29:50 -07:00
Anton Dyudin
0cd98d9c2c get rid of bal par copy, restrict read-line mutation 2017-08-24 20:31:37 -07:00
Anton Dyudin
d3f9ecb667 move code unrelated to opening items out of ++open-item 2017-08-24 20:05:31 -07:00
Anton Dyudin
54105e7fd0 formalize %poem as an indent-based style 2017-08-24 19:51:16 -07:00
Anton Dyudin
0fcf16898e formalize %dent parsing 2017-08-24 19:13:49 -07:00
Anton Dyudin
fa2b9a0eea use read-one for --- <hr> parsing 
instead of counting it as a container "item"
 2017-08-24 18:10:22 -07:00
Anton Dyudin
7cbaffcbed refactor fenced-code postprocessing into ++parse 2017-08-24 17:49:23 -07:00
Ted Blackman
9a72aa2147 whitespace 2017-08-24 17:02:02 -07:00
Ted Blackman
7c2a56b929 markdown in sail 2017-08-24 16:32:45 -07:00
Ted Blackman
fd022172c9 parse empty div; changed indent representation 2017-08-24 15:04:24 -07:00
Ted Blackman
398c0dd180 Adds == as markdown terminator 2017-08-24 14:22:38 -07:00
Ted Blackman
fe44db7e3d categorized trig-style 2017-08-24 13:33:25 -07:00
Ted Blackman
c4793de019 Fix bug with outdent (col -> top) 2017-08-24 13:20:46 -07:00
Ted Blackman
dc993fe091 rename arms, clean comments 2017-08-23 18:09:25 -07:00
Ted Blackman
1b5d25a71e Detect outdent in ++snap 2017-08-23 17:05:59 -07:00
Ted Blackman
45658a6017 Revert "backtracking hack to fix dedent parsing; adds == as terminator" 
This reverts commit 459ff495b3.
 2017-08-23 10:26:10 -07:00
Ted Blackman
ef7ee5918a cleanup 2017-08-22 17:13:32 -07:00
Ted Blackman
459ff495b3 backtracking hack to fix dedent parsing; adds == as terminator 2017-08-22 17:02:13 -07:00
Ted Blackman
38ce350352 ;> to start markdown 2017-08-22 15:03:34 -07:00
Ted Blackman
8c7dc9706f Fix indented fenced blocks and test file 2017-08-22 14:58:44 -07:00
Ted Blackman
28acd75a9a fenced code blocks in separate parser to support blank lines 2017-08-22 14:02:44 -07:00
Ted Blackman
5626c70b31 Fix --- eating next line 2017-08-22 12:34:27 -07:00
Ted Blackman
1de4408df3 Fenced code blocks 2017-08-21 16:32:03 -07:00
Ted Blackman
31aba9606c removed leading zap in new vast2.hoon 2017-08-18 18:43:44 -07:00
Fang
caac4c8913 Removed ++partner. Everything is now ++circles. 2017-07-10 17:21:58 -07:00
Fang
8ceb9312d1 Removed delivery state from telegram audiences. 2017-07-06 18:16:17 -07:00
Fang
4aa069c9f8 Removed bouquet for now. 2017-06-30 18:42:36 -07:00
Fang
2852b71070 %source config diff now only takes a single partner, since it never gets done for multiple. 2017-06-28 11:12:12 -07:00
Fang
3e32f78ac1 Can now set presence or status for specific circles, even foreign ones. 2017-06-27 17:29:51 -07:00
Fang
ee4883d91b tmp function in lib/talk.hoon. 2017-06-26 16:49:46 -07:00
Fang
0642ee5f16 Cleanup of inline docs and comments. 2017-06-21 17:16:22 -07:00
Fang
90c0ccdad0 Renamed sre and sourcee back to src and source. 2017-06-15 18:53:47 -07:00
Raymond Pasco
43bb99b61b Merge remote-tracking branches 'ohaitch/wipe-ford', 'ohaitch/fora-dubl' and 'keatondunsford/add-noun-mark' into maint-20170614 
add |wipe-ford cache clear button
tree@da7808a actually disable post box upon submission
Add minimal noun.hoon mark to /mar
 2017-06-14 14:34:13 -07:00
Fang
9dbdd3f89f Tiny changes, comments & cleanup. 2017-06-13 18:06:38 -07:00
Fang
09a155f1c6 Fixed federation across galaxies. 2017-06-13 17:51:10 -07:00
Fang
563aa0102e Mostly functional federation & delta model. 2017-06-12 15:19:45 -07:00
C. Guy Yarvin
cda7cf2053 Basic networking; large messages have assembly bug 2017-06-06 17:29:37 -07:00
C. Guy Yarvin
8985648bc2 Basic networking now. 2017-06-06 13:23:58 -07:00
Anton Dyudin
a216565a14 add |wipe-ford cache clear button 2017-05-24 16:04:27 -07:00
Fang
23cd3ad758 Newly updated in-between commit for delta-model talk. tmp 2017-05-22 17:10:24 +02:00
C. Guy Yarvin
4e7edbc154 App failures and vane crashes handled correctly. 
Still not sending app or vane crashes in nack, though.
 2017-05-21 21:31:43 -07:00
C. Guy Yarvin
b889898efb Restore unified old naming of ames tasks/gifts. 2017-05-21 18:36:29 -07:00
C. Guy Yarvin
eff8b8fe7b Merge branch 'nuclear' into remaint 2017-05-19 11:26:13 -07:00
Raymond Pasco
7dc270f89f Merge remote-tracking branch 'joemfb/detap' 2017-05-17 05:38:26 -04:00
C. Guy Yarvin
bd4f650f5e |nuke bounces all packets from a ship. 2017-05-16 13:56:54 -07:00
Fang
5e02dc7db2 Removed trailing spaces from talk lib and marks files. 2017-04-25 21:21:46 +02:00
C. Guy Yarvin
c8e262df75 Fully booting with new chapter structures. 2017-04-16 15:37:47 -07:00
Fang
8b8e080806 Removed talk invite functionality from lib/helm. It's now done through talk. 2017-04-14 13:04:19 +02:00
Fang
85a13cea21 Fully deprecated %design and %publish commands in favor of the new actions. 2017-04-14 13:02:38 +02:00
Fang
c33d5a04e5 Implemented ;invite and ;banish for giving and denying permission to stations. 
Read permissions for journals and mailboxes are constant: all and our team resp.
 2017-04-11 12:17:23 +02:00
Raymond Pasco
e10dc26bea Merge remote-tracking branches 'Fang/urbjs-isurl', 'ohaitch/stray-marks', 'eglaysher/fix-help', 'joemfb/prompt-sticky-master', 'joemfb/cork-safe' and 'joemfb/fry-nest' 2017-03-28 07:35:46 -04:00
Joseph Bryan
af767350a8 removes +-tap:by accumulator arg and changes calling convention 2017-03-20 18:56:00 -04:00
Joseph Bryan
ebed890f00 removes +-tap:in accumulator arg and changes calling convention 2017-03-20 18:55:55 -04:00
Raymond Pasco
a4632044f3 dirk card 2017-03-08 07:20:29 -05:00
Raymond Pasco
4f475f8f93 use full beam 2017-03-08 07:20:29 -05:00
Joseph Bryan
f8b60ec802 refactors ++ta-off in drum 2017-03-03 15:31:47 -05:00
Joseph Bryan
43dc8afd1d refactors ++ta-off in drum 2017-03-03 15:30:09 -05:00
Joseph Bryan
3e321a5567 adds back the old-style prompt truncation for really long prompts 2017-03-03 12:05:56 -05:00
Joseph Bryan
880c11f055 resets drum input offset on ctrl-x 2017-03-03 12:04:37 -05:00
Joseph Bryan
da3ccfa238 resets drum input offset on sole-edit discontinuities ($set) 
and renames ++ta-off -> ++ta-pos
 2017-03-03 12:04:37 -05:00
Joseph Bryan
4363b76957 updates drum input scroller to be sticky 2017-03-03 12:04:37 -05:00
Joseph Bryan
23966fe45b switches drum to a sticky prompt, scrolling input only 2017-03-03 12:04:30 -05:00
Joseph Bryan
f92374e069 adds back the old-style prompt truncation for really long prompts 2017-03-02 11:10:33 -05:00
Joseph Bryan
d26eef297a resets drum input offset on ctrl-x 2017-03-02 10:55:16 -05:00
Joseph Bryan
5a09818bcd resets drum input offset on sole-edit discontinuities ($set) 
and renames ++ta-off -> ++ta-pos
 2017-03-02 10:54:31 -05:00
Joseph Bryan
5c07bbd93e updates drum input scroller to be sticky 2017-03-02 10:54:06 -05:00
Joseph Bryan
74f32a67dd switches drum to a sticky prompt, scrolling input only 2017-03-02 10:53:36 -05:00
Anton Dyudin
08d1e49c8a fix up remaining marks 2017-02-14 11:11:52 -08:00
Raymond Pasco
bab93e7ac2 Merge remote-tracking branch 'ohAitch/zuseflat-pretty' 
Complete the restructuring of zuse. Add old-zuse compatibility layer.
 2017-02-13 22:19:03 -05:00
Anton Dyudin
53eef4cd8d marks mostly functional 2017-02-13 16:02:25 -08:00
Anton Dyudin
9eea8eda67 add old-zuse polyfill library 2017-02-13 14:31:10 -08:00
chc4
31beacfab1 Remove <urb:pre> tags 
I added these a forever ago with plans on making the library docs self-explaining, but never did that for a number of reasons (speed, looks, %eyre going insane and breaking which I could never track down...)

I'm, uh, mildly concerned that this is still here. Because `slap`, although purely functional, doesn't time out Nock evaluations. And everything that is posted to `:tree`, including third-party content, is ran through this. You can connect the dots.
 2017-02-10 23:39:51 -05:00
Raymond Pasco
fd6d28ccc0 Remove blank lines at EOF 2016-12-15 22:52:53 -08:00
Raymond Pasco
bbc4d2c0ee Repository cleanup 
mostly trailing whitespace removal
no new kernel because only changes there are whitespace removal
 2016-12-15 22:36:45 -08:00
Anton Dyudin
9c5c460847 track arvo.hoon in autoload 2016-12-12 10:08:46 -08:00
Anton Dyudin
91f8049819 remove ^vane shims 
requires vere without crypto:ames
 2016-12-08 13:50:32 -08:00
Anton Dyudin
0adde510ab canonize url:eyre, the last remaining compatibility interface 2016-12-08 13:50:32 -08:00
Anton Dyudin
fc4cdc56f6 canonize taco,tact:bytes:eyre 2016-12-08 13:50:32 -08:00
Anton Dyudin
7d66d8c3df canonize (parse|print):xml:eyre as (en|de)-xml:html 2016-12-08 13:50:32 -08:00
Anton Dyudin
4a37034a45 fix |autoload, |reboot 2016-12-08 13:50:31 -08:00
Anton Dyudin
44288642bf canonize jo..:js:eyre into enjs:format 2016-12-08 13:50:31 -08:00
Anton Dyudin
e7d08ac15f canonize pojo,poja as en-json,de-json :html 2016-12-08 13:50:31 -08:00
Anton Dyudin
5fbb2dff28 port forward lore, role, and rolt usage 2016-12-08 13:50:31 -08:00
C. Guy Yarvin
c81681f19a Merge remote-tracking branch 'ohAitch/zuseflat-users' into plastic-boot 2016-12-02 11:32:34 -08:00
C. Guy Yarvin
5f3ee116eb %velo reset works. 2016-12-01 17:17:02 -08:00
Anton Dyudin
75b2840b97 canonize references into space:clay 2016-12-01 16:02:06 -08:00
Anton Dyudin
e7140e3c37 translate ++jo usage to ++dejs or ++dejs-soft 2016-12-01 15:29:32 -08:00
Anton Dyudin
5f357346d8 flatten references to title,wired,differ,crypto,chrono 2016-12-01 13:46:18 -08:00
Anton Dyudin
56da2fdb95 isolate pubsub:userlib usage 2016-12-01 13:46:17 -08:00
Anton Dyudin
584d30d0e3 fix markdown jet attachment 2016-11-29 18:16:56 -08:00
Anton Dyudin
8dbca52617 remove ++da:jo UTC json parser 2016-11-23 16:35:43 -08:00
Anton Dyudin
3f904b4f90 remove ++epur:url:eyre convenience interface 2016-11-23 16:34:10 -08:00
Anton Dyudin
83afc6405c overzealous =, 2016-11-17 10:47:06 -08:00
Anton Dyudin
a373a6ef11 !: in ford files is redundant 2016-11-16 17:42:58 -08:00
Anton Dyudin
971c378ce8 reformat =+ to =, in ford files 2016-11-16 17:37:39 -08:00
Anton Dyudin
e445aa6e6f =, all marks and dependencies 2016-11-16 17:30:39 -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
257e5189df Merge commit 'b34442' into cc-merge 2016-11-13 19:39:34 -08:00
C. Guy Yarvin
696edafb33 Merge commit 'a7348' into cc-merge 2016-11-13 19:39:05 -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
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
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
8a6b77149c Merge commit 'd0153' into cc-merge 2016-11-13 18:51:57 -08:00
C. Guy Yarvin
ba22c9b86d Merge commit 'f252988' into cc-merge 2016-11-13 18:51:21 -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
d3e06e1103 Merge commit '7e06f4' into cc-merge 2016-11-13 18:27:13 -08:00
C. Guy Yarvin
092f795702 Merge commit 'b3724' into cc-merge 2016-11-13 17:54:01 -08:00
C. Guy Yarvin
4cf01ed37b Merge commit '9fee74' into cc-merge 2016-11-13 17:51:57 -08:00
C. Guy Yarvin
4fa6152375 Merge commit '6d159d' into cc-merge 2016-11-13 17:49:37 -08:00
C. Guy Yarvin
b7af9fabc4 Merge commit 'e710d' into cc-merge 2016-11-13 17:49:24 -08:00
C. Guy Yarvin
81e0f3ff60 Merge commit '021bfc2' into cc-merge 2016-11-13 17:39:44 -08:00
C. Guy Yarvin
a7192a90ee Merge commit 'abbe997d' into cc-merge 2016-11-13 16:55:05 -08:00
C. Guy Yarvin
04dad74b25 Merge commit '450f0' into cc-merge 2016-11-13 16:54:44 -08:00
C. Guy Yarvin
54abb6ba8c Merge commit '81945' into cc-merge 2016-11-13 16:54:36 -08:00
C. Guy Yarvin
d390509d3b Merge commit '6854bfabb' into cc-merge 2016-11-13 16:54:29 -08:00
C. Guy Yarvin
02ab983b7d Merge commit '4b7d33' into cc-merge 2016-11-13 16:54:20 -08:00
C. Guy Yarvin
37c25fdeef Merge commit 'ddfc0f1' into cc-merge 2016-11-13 16:54:09 -08:00
C. Guy Yarvin
6f52e2d538 Merge commit '510b77' into cc-merge 2016-11-13 16:54:02 -08:00
C. Guy Yarvin
2e0f528f8c Merge commit '8d101' into cc-merge 2016-11-13 16:53:52 -08:00
C. Guy Yarvin
4c37201c68 Merge commit '8bf7564' into cc-merge 2016-11-13 16:53:44 -08:00
C. Guy Yarvin
6e0821bc56 Merge commit '8fdea678' into cc-merge 2016-11-13 16:53:30 -08:00
C. Guy Yarvin
228d5c3fc6 Merge commit 'd549fb' into cc-merge 2016-11-13 15:34:18 -08:00
C. Guy Yarvin
1fae096570 Merge commit '52f78' into cc-merge 2016-11-13 15:34:10 -08:00
C. Guy Yarvin
b8ca226e23 Merge commit 'b49c7' into cc-merge 2016-11-13 15:32:48 -08:00
C. Guy Yarvin
bcdb8a6087 Merge commit '2498cf' into cc-merge 2016-11-13 15:32:08 -08:00
C. Guy Yarvin
35bb107ed8 Merge commit '0691022' into cc-merge 2016-11-13 15:28:53 -08:00
C. Guy Yarvin
923881ee62 Fix up for ^gall. 2016-11-13 15:28:37 -08:00
C. Guy Yarvin
eaf2e538bf Merge commit 'dba8ca' into cc-merge 2016-11-13 15:26:26 -08:00
C. Guy Yarvin
51e7ed2a99 Merge commit '2509b' into cc-merge 2016-11-13 15:26:16 -08:00
C. Guy Yarvin
1739412ec1 Merge commit '0d04bd' into cc-merge 2016-11-13 15:26:04 -08:00
C. Guy Yarvin
70bec126ac Merge commit '5696d250' into cc-merge 2016-11-13 15:23:06 -08:00
C. Guy Yarvin
e141749b4d Merge commit '7fddd' into cc-merge 2016-11-13 15:22:40 -08:00
C. Guy Yarvin
a8c6041676 Merge commit '59fd3' into cc-merge 2016-11-11 17:28:11 -08:00
C. Guy Yarvin
f4b6bf5584 Merge commit '64189b3' into cc-merge 2016-11-11 17:26:19 -08:00
C. Guy Yarvin
b9e6fea2b9 Merge commit '0f2f8' into cc-merge 2016-11-11 17:19:34 -08:00
C. Guy Yarvin
0855c41b38 Merge commit 'e49f07' into cc-merge 2016-11-11 16:23:20 -08:00
C. Guy Yarvin
70d5682e2b Merge commit 'f25d196' into cc-merge 2016-11-11 15:14:47 -08:00
C. Guy Yarvin
7464e26e93 Merge commit 'a4a5b133' into cc-merge 2016-11-11 13:50:44 -08:00
C. Guy Yarvin
a33ed31678 Merge commit '4421ccac' into cc-merge 2016-11-11 13:50:29 -08:00