summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '2.11.x' into topic/merge-2.11.x-to-2.12.x-20160210Jason Zaugg2016-02-1015-19/+503
|\
| * Merge pull request #4950 from retronym/topic/sbt-tweaks-3Seth Tisue2016-02-096-4/+421
| |\
| | * Add SBT tab completion for scala{,c,doc}Jason Zaugg2016-02-094-18/+221
| | * Enable IntellIJ smarts while editing the buildJason Zaugg2016-02-072-1/+111
| | * Add tab completion to the partest commandJason Zaugg2016-02-062-1/+87
| | * Convenient aliases for the SBT buildJason Zaugg2016-02-051-3/+21
| * | Merge pull request #4937 from szeiger/issue/9623-2.11Seth Tisue2016-02-082-6/+73
| |\ \ | | |/ | |/|
| | * SI-9623 Avoid unnecessary hasNext calls in JoinIterator & ConcatIteratorStefan Zeiger2016-02-012-6/+73
| * | Merge pull request #4942 from SethTisue/copyright-2016Seth Tisue2016-02-047-9/+9
| |\ \
| | * | bump copyright year to 2016Seth Tisue2016-02-037-9/+9
| |/ /
* | | Merge pull request #4952 from felixmulder/topic/scaladoc-hideImplicitConversi...Vlad Ureche2016-02-097-70/+132
|\ \ \
| * | | SI-9620: add doc annotation to hide specific conversionsFelix Mulder2016-02-097-70/+132
|/ / /
* | | Merge pull request #4948 from szeiger/issue/9574Stefan Zeiger2016-02-093-6/+27
|\ \ \
| * | | SI-9574 Prevent illegal overrides of members with module typesStefan Zeiger2016-02-083-6/+27
* | | | Merge pull request #4949 from felixmulder/topic/scaladoc-fix-implicits-arrayVlad Ureche2016-02-061-0/+11
|\ \ \ \
| * | | | Scaladoc: fix duplicate implicits in ArrayFelix Mulder2016-02-061-0/+11
|/ / / /
* | | | Merge pull request #4946 from felixmulder/topic/scaladoc-panzoom-graphsVlad Ureche2016-02-0610-155/+193
|\ \ \ \
| * | | | Add panzoom feature to Type Inheritance graphsFelix Mulder2016-02-0610-155/+193
|/ / / /
* | | | Merge pull request #4947 from felixmulder/topic/scaladoc-fix-stray-numberVlad Ureche2016-02-061-0/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Scaladoc: fix stray number in codeblocks for firefoxFelix Mulder2016-02-051-0/+4
|/ / /
* | | Merge pull request #4941 from retronym/merge/2.11.x-to-2.12.x-20160203Jason Zaugg2016-02-0552-195/+679
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/2.12.x' into merge/2.11.x-to-2.12.x-2016...Jason Zaugg2016-02-0478-525/+935
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #4940 from lrytz/partestUpgradeSeth Tisue2016-02-036-2/+14
|\ \ \ \
| * | | | Update partest to 1.0.12, test case for reporting invalid flagsLukas Rytz2016-02-037-3/+15
* | | | | Merge pull request #4920 from lrytz/oldOptimizerTestsLukas Rytz2016-02-0351-394/+595
|\ \ \ \ \
| * | | | | Re-write and Re-enable optimizer testsLukas Rytz2016-02-0347-256/+421
| * | | | | show erroneous compiler flags in junit compiler testsLukas Rytz2016-02-031-2/+4
| * | | | | rename -YoptTrace to -Yopt-traceLukas Rytz2016-02-031-1/+1
| * | | | | Improve simplifyJumpsLukas Rytz2016-02-032-135/+169
* | | | | | Merge pull request #4737 from soc/SI-9315Lukas Rytz2016-02-036-21/+101
|\ \ \ \ \ \
| * | | | | | SI-9315 Desugar string concat to java.lang.StringBuilder ...Simon Ochsenreither2016-02-036-21/+101
| |/ / / / /
* | | | | | Merge pull request #4904 from Ichoran/reusable-buildersLukas Rytz2016-02-0315-108/+225
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Clarified and expanded which Builders were reusableRex Kerr2016-01-3015-108/+225
| | | * | | Merge commit 'cc6fea6' into merge/2.11.x-to-2.12.x-20160203Jason Zaugg2016-02-0423-136/+315
| | | |\| |
| | | | * | Merge pull request #4927 from szeiger/issue/9572Jason Zaugg2016-02-015-35/+71
| | | | |\ \
| | | | | * | SI-9572 Check for illegal tuple sizes in the parserStefan Zeiger2016-01-285-35/+71
| | | | | |/
| | | | * | Merge pull request #4922 from SethTisue/fix-cla-linksJason Zaugg2016-02-012-2/+2
| | | | |\ \
| | | | | * | fix broken links to Scala CLASeth Tisue2016-01-272-2/+2
| | | | * | | Merge pull request #4921 from szeiger/issue/9534Jason Zaugg2016-02-012-1/+14
| | | | |\ \ \
| | | | | * | | SI-9534 Use BoxedUnit in all cases for creating Array[Unit]Stefan Zeiger2016-01-272-1/+14
| | | | | | |/ | | | | | |/|
| | | | * | | Merge pull request #4932 from SethTisue/readme-tweakSeth Tisue2016-01-291-1/+1
| | | | |\ \ \
| | | | | * | | tweak my own entry in the readmeSeth Tisue2016-01-291-1/+1
| | | | |/ / /
| | | | * | | Merge pull request #4884 from szeiger/wip/sbt-pr-validationSeth Tisue2016-01-297-68/+121
| | | | |\ \ \ | | | | | |/ / | | | | |/| |
| | | | | * | Use sbt for PR validation builds.Stefan Zeiger2016-01-127-68/+121
| | | | * | | Merge pull request #4891 from janekdb/2.11.x-CommentFactoryBase-mix-1Lukas Rytz2016-01-263-18/+85
| | | | |\ \ \
| | | | | * | | Trim complexity in CommentFactoryBaseJanek Bogucki2016-01-253-18/+85
| | | | | | |/ | | | | | |/|
| | | | * | | Merge pull request #4913 from szeiger/wip/sbt-windows-fixesLukas Rytz2016-01-263-12/+20
| | | | |\ \ \
| | | | | * | | Improved EOL handling for scripts generated by the sbt buildStefan Zeiger2016-01-251-9/+10
| | | | | * | | Use portable Java APIs instead of calling chmod from sbtStefan Zeiger2016-01-251-3/+4
| | | | | * | | Use Windows classpath in sh scripts when building in sbt on WindowsStefan Zeiger2016-01-211-4/+10