summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | Unfinalize the class DefaultPromiseJason Zaugg2015-08-131-6/+8
|/ / / / / / / / /
* | | | | | | | | Merge pull request #4608 from ruippeixotog/improve-mutable-treesetSeth Tisue2015-08-068-59/+424
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | SI-6938 Use mutable red-black tree in TreeSetRui Gonçalves2015-07-288-59/+424
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge pull request #4648 from Ichoran/issue/8554-againSeth Tisue2015-08-065-23/+35
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | SI-8554 Two-arg remove throws exception on large countRex Kerr2015-07-195-23/+35
* | | | | | | | | | Merge pull request #4660 from som-snytt/issue/9270Seth Tisue2015-08-061-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | SI-9270 Default xml coalescing off in 2.12Som Snytt2015-07-251-1/+1
* | | | | | | | | | | Merge pull request #4677 from qilab-/ticket-9426Seth Tisue2015-08-061-6/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | add @deprecatedNameqilab gamma2015-08-041-3/+3
| * | | | | | | | | | | rename argument f of LinearSeqOptimized.reduceLeft to op in accordance with s...qilab gamma2015-08-021-2/+2
| * | | | | | | | | | | rename argument f of LinearSeqOptimized.foldLeft/foldRight to op in accordanc...qilab gamma2015-08-021-4/+4
| |/ / / / / / / / / /
* | | | | | | | | | | Merge pull request #4687 from adriaanm/merge-2.11.x-aug-5Seth Tisue2015-08-0541-102/+267
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Merge branch '2.11.x' into 2.12.xAdriaan Moors2015-08-0536-94/+259
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge pull request #4682 from adriaanm/jline-quick.binSeth Tisue2015-08-051-1/+1
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | |
| | | * | | | | | | | Include jline on quick.bin tool pathAdriaan Moors2015-08-041-1/+1
| | | | |_|_|/ / / / | | | |/| | | | | |
| | * | | | | | | | Merge pull request #4680 from janekdb/2.11.x-optionJason Zaugg2015-08-054-41/+11
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | | * | | | | | | Delegate null test to OptionJanek Bogucki2015-08-044-41/+11
| | |/ / / / / / /
| | * | | | | | | Merge pull request #4670 from retronym/ticket/9422Lukas Rytz2015-07-292-3/+16
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | | * | | | | | SI-9422 Fix incorrect constant propagationJason Zaugg2015-07-292-3/+16
| | * | | | | | | Merge pull request #4669 from janekdb/2.11.x-scaladoc-reflectJason Zaugg2015-07-298-13/+12
| | |\ \ \ \ \ \ \
| | | * | | | | | | ScalaDoc fixes for reflectJanek Bogucki2015-07-288-13/+12
| | * | | | | | | | Merge pull request #4667 from janekdb/2.11.x-scaladoc-library-library-auxJason Zaugg2015-07-298-11/+11
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | | * | | | | | | ScalaDoc fixes for library and library-auxJanek Bogucki2015-07-288-11/+11
| | * | | | | | | | Merge pull request #4665 from lrytz/asm-504-3Lukas Rytz2015-07-281-1/+1
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Upgrade scala-asm to 5.0.4-scala-3Lukas Rytz2015-07-281-1/+1
| | |/ / / / / / / /
| | * | | | | | | | Merge pull request #4661 from retronym/ticket/9365Lukas Rytz2015-07-284-1/+69
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | SI-9365 Don't null out dependencies of transient lazy valsJason Zaugg2015-07-274-1/+69
| | | | |/ / / / / / | | | |/| | | | | |
| | * | | | | | | | Merge pull request #4662 from janekdb/2.11.x-redundant-val-modifierLukas Rytz2015-07-281-2/+2
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Remove redundant 'val' from case class params.Janek Bogucki2015-07-271-2/+2
| | * | | | | | | | | Merge pull request #4664 from SethTisue/remove-dead-link-in-readmeLukas Rytz2015-07-281-1/+1
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | |
| | | * | | | | | | | fix readme for death of typesafe.artifactoryonline.comSeth Tisue2015-07-271-1/+1
| | | |/ / / / / / /
| | * | | | | | | | Merge pull request #4636 from SethTisue/contributor-stuff-from-github-wikiSeth Tisue2015-07-272-17/+94
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | | * | | | | | | merge two reviewers lists in readmeSeth Tisue2015-07-271-23/+9
| | | * | | | | | | tighten up CONTRIBUTING.md a littleSeth Tisue2015-07-161-5/+3
| | | * | | | | | | readme/contributor's guide tweaksSeth Tisue2015-07-162-16/+5
| | | * | | | | | | tiny readme fixSeth Tisue2015-07-151-1/+1
| | | * | | | | | | merge in text from pull request policy from old wikiSeth Tisue2015-07-152-76/+114
| | | * | | | | | | drop in pull request policy from old wikiSeth Tisue2015-07-131-0/+65
| | | * | | | | | | contributor guide: add a morsel salvaged from GitHub wikiSeth Tisue2015-07-131-0/+1
| | | | |_|_|/ / / | | | |/| | | | |
| | * | | | | | | Merge pull request #4653 from lrytz/t9403Jason Zaugg2015-07-275-3/+41
| | |\ \ \ \ \ \ \
| | | * | | | | | | SI-9403 fix ICodeReader for negative BIPUSH / SIPUSH valuesLukas Rytz2015-07-245-3/+41
| | | | |/ / / / / | | | |/| | | | |
| * | | | | | | | Merge commit 'f2d7838d90' into 2.12.xAdriaan Moors2015-08-050-0/+0
| |\| | | | | | |
| | * | | | | | | Merge pull request #4657 from lrytz/backportsJason Zaugg2015-07-2742-429/+952
| | |\ \ \ \ \ \ \
| | | * | | | | | | Rename the ENUM / DEFAULTMETHOD flags to include JAVA_Lukas Rytz2015-07-2412-125/+125
| | | * | | | | | | SI-9393 fix modifiers of ClassBTypes for Java annotationsLukas Rytz2015-07-2418-40/+188
| | | * | | | | | | [backport] Fix bytecode stability when running the closure optimizerLukas Rytz2015-07-231-8/+8
| | | * | | | | | | [backport] SI-9392 Clarify the workaround comment and introduce a devWarningLukas Rytz2015-07-231-8/+8
| | | * | | | | | | [backport] SI-9392 Avoid crash in GenBCode for incoherent treesJason Zaugg2015-07-233-0/+28
| | | * | | | | | | [backport] SI-9393 Temporarily disable two assertions in GenBCodeJason Zaugg2015-07-234-10/+32
| | | * | | | | | | [backport] Refactor the ClosureOptimizer, run ProdCons only once per methodLukas Rytz2015-07-233-158/+231