Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #4690 from retronym/topic/defaultpromise | Jason Zaugg | 2015-08-18 | 1 | -6/+8 |
|\ | |||||
| * | Unfinalize the class DefaultPromise | Jason Zaugg | 2015-08-13 | 1 | -6/+8 |
|/ | |||||
* | Merge pull request #4608 from ruippeixotog/improve-mutable-treeset | Seth Tisue | 2015-08-06 | 8 | -59/+424 |
|\ | |||||
| * | SI-6938 Use mutable red-black tree in TreeSet | Rui Gonçalves | 2015-07-28 | 8 | -59/+424 |
* | | Merge pull request #4648 from Ichoran/issue/8554-again | Seth Tisue | 2015-08-06 | 5 | -23/+35 |
|\ \ | |||||
| * | | SI-8554 Two-arg remove throws exception on large count | Rex Kerr | 2015-07-19 | 5 | -23/+35 |
* | | | Merge pull request #4660 from som-snytt/issue/9270 | Seth Tisue | 2015-08-06 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | SI-9270 Default xml coalescing off in 2.12 | Som Snytt | 2015-07-25 | 1 | -1/+1 |
* | | | | Merge pull request #4677 from qilab-/ticket-9426 | Seth Tisue | 2015-08-06 | 1 | -6/+6 |
|\ \ \ \ | |||||
| * | | | | add @deprecatedName | qilab gamma | 2015-08-04 | 1 | -3/+3 |
| * | | | | rename argument f of LinearSeqOptimized.reduceLeft to op in accordance with s... | qilab gamma | 2015-08-02 | 1 | -2/+2 |
| * | | | | rename argument f of LinearSeqOptimized.foldLeft/foldRight to op in accordanc... | qilab gamma | 2015-08-02 | 1 | -4/+4 |
| |/ / / | |||||
* | | | | Merge pull request #4687 from adriaanm/merge-2.11.x-aug-5 | Seth Tisue | 2015-08-05 | 41 | -102/+267 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Merge branch '2.11.x' into 2.12.x | Adriaan Moors | 2015-08-05 | 36 | -94/+259 |
| |\ \ \ | |||||
| | * \ \ | Merge pull request #4682 from adriaanm/jline-quick.bin | Seth Tisue | 2015-08-05 | 1 | -1/+1 |
| | |\ \ \ | |||||
| | | * | | | Include jline on quick.bin tool path | Adriaan Moors | 2015-08-04 | 1 | -1/+1 |
| | * | | | | Merge pull request #4680 from janekdb/2.11.x-option | Jason Zaugg | 2015-08-05 | 4 | -41/+11 |
| | |\ \ \ \ | | | |/ / / | | |/| | | | |||||
| | | * | | | Delegate null test to Option | Janek Bogucki | 2015-08-04 | 4 | -41/+11 |
| | |/ / / | |||||
| | * | | | Merge pull request #4670 from retronym/ticket/9422 | Lukas Rytz | 2015-07-29 | 2 | -3/+16 |
| | |\ \ \ | |||||
| | | * | | | SI-9422 Fix incorrect constant propagation | Jason Zaugg | 2015-07-29 | 2 | -3/+16 |
| | * | | | | Merge pull request #4669 from janekdb/2.11.x-scaladoc-reflect | Jason Zaugg | 2015-07-29 | 8 | -13/+12 |
| | |\ \ \ \ | |||||
| | | * | | | | ScalaDoc fixes for reflect | Janek Bogucki | 2015-07-28 | 8 | -13/+12 |
| | * | | | | | Merge pull request #4667 from janekdb/2.11.x-scaladoc-library-library-aux | Jason Zaugg | 2015-07-29 | 8 | -11/+11 |
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | | * | | | | ScalaDoc fixes for library and library-aux | Janek Bogucki | 2015-07-28 | 8 | -11/+11 |
| | * | | | | | Merge pull request #4665 from lrytz/asm-504-3 | Lukas Rytz | 2015-07-28 | 1 | -1/+1 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Upgrade scala-asm to 5.0.4-scala-3 | Lukas Rytz | 2015-07-28 | 1 | -1/+1 |
| | |/ / / / / | |||||
| | * | | | | | Merge pull request #4661 from retronym/ticket/9365 | Lukas Rytz | 2015-07-28 | 4 | -1/+69 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | SI-9365 Don't null out dependencies of transient lazy vals | Jason Zaugg | 2015-07-27 | 4 | -1/+69 |
| | | | |/ / / | | | |/| | | | |||||
| | * | | | | | Merge pull request #4662 from janekdb/2.11.x-redundant-val-modifier | Lukas Rytz | 2015-07-28 | 1 | -2/+2 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Remove redundant 'val' from case class params. | Janek Bogucki | 2015-07-27 | 1 | -2/+2 |
| | * | | | | | | Merge pull request #4664 from SethTisue/remove-dead-link-in-readme | Lukas Rytz | 2015-07-28 | 1 | -1/+1 |
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | |||||
| | | * | | | | | fix readme for death of typesafe.artifactoryonline.com | Seth Tisue | 2015-07-27 | 1 | -1/+1 |
| | | |/ / / / | |||||
| | * | | | | | Merge pull request #4636 from SethTisue/contributor-stuff-from-github-wiki | Seth Tisue | 2015-07-27 | 2 | -17/+94 |
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | | * | | | | merge two reviewers lists in readme | Seth Tisue | 2015-07-27 | 1 | -23/+9 |
| | | * | | | | tighten up CONTRIBUTING.md a little | Seth Tisue | 2015-07-16 | 1 | -5/+3 |
| | | * | | | | readme/contributor's guide tweaks | Seth Tisue | 2015-07-16 | 2 | -16/+5 |
| | | * | | | | tiny readme fix | Seth Tisue | 2015-07-15 | 1 | -1/+1 |
| | | * | | | | merge in text from pull request policy from old wiki | Seth Tisue | 2015-07-15 | 2 | -76/+114 |
| | | * | | | | drop in pull request policy from old wiki | Seth Tisue | 2015-07-13 | 1 | -0/+65 |
| | | * | | | | contributor guide: add a morsel salvaged from GitHub wiki | Seth Tisue | 2015-07-13 | 1 | -0/+1 |
| | * | | | | | Merge pull request #4653 from lrytz/t9403 | Jason Zaugg | 2015-07-27 | 5 | -3/+41 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | SI-9403 fix ICodeReader for negative BIPUSH / SIPUSH values | Lukas Rytz | 2015-07-24 | 5 | -3/+41 |
| | | | |/ / / | | | |/| | | | |||||
| * | | | | | | Merge commit 'f2d7838d90' into 2.12.x | Adriaan Moors | 2015-08-05 | 0 | -0/+0 |
| |\| | | | | | |||||
| | * | | | | | Merge pull request #4657 from lrytz/backports | Jason Zaugg | 2015-07-27 | 42 | -429/+952 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Rename the ENUM / DEFAULTMETHOD flags to include JAVA_ | Lukas Rytz | 2015-07-24 | 12 | -125/+125 |
| | | * | | | | | SI-9393 fix modifiers of ClassBTypes for Java annotations | Lukas Rytz | 2015-07-24 | 18 | -40/+188 |
| | | * | | | | | [backport] Fix bytecode stability when running the closure optimizer | Lukas Rytz | 2015-07-23 | 1 | -8/+8 |
| | | * | | | | | [backport] SI-9392 Clarify the workaround comment and introduce a devWarning | Lukas Rytz | 2015-07-23 | 1 | -8/+8 |
| | | * | | | | | [backport] SI-9392 Avoid crash in GenBCode for incoherent trees | Jason Zaugg | 2015-07-23 | 3 | -0/+28 |
| | | * | | | | | [backport] SI-9393 Temporarily disable two assertions in GenBCode | Jason Zaugg | 2015-07-23 | 4 | -10/+32 |