summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Merge pull request #4265 from retronym/ticket/9110Lukas Rytz2015-12-182-1/+29
|\ \ \ \ \
| * | | | | SI-9110 Pattern `O.C` must check `$outer eq O` for a top level OJason Zaugg2015-11-262-1/+29
| | |_|/ / | |/| | |
* | | | | Merge pull request #4879 from ShaneDelmore/SI-9583Seth Tisue2015-12-112-1/+28
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | SI-9583: Update SystemProperties.empty to return a mutable.Map to fix buildersShane Delmore2015-12-102-1/+28
|/ / / /
* | | | Merge pull request #4865 from SethTisue/intellij-readme-improvementsLukas Rytz2015-12-101-7/+14
|\ \ \ \
| * | | | IntelliJ README improvementsSeth Tisue2015-11-251-7/+14
| |/ / /
* | | | Merge pull request #4874 from szeiger/wip/upgrade-jarjarLukas Rytz2015-11-271-2/+2
|\ \ \ \
| * | | | Upgrade JarJar in the ant buildStefan Zeiger2015-11-271-2/+2
| |/ / /
* | | | Merge pull request #4873 from lrytz/merge-2.11-to-2.12-nov-27Lukas Rytz2015-11-2713-31/+40
|\ \ \ \
| * \ \ \ Merge commit '5e99f82' into merge-2.11-to-2.12-nov-27Lukas Rytz2015-11-2712-28/+28
| |\ \ \ \
| | * \ \ \ Merge pull request #4869 from janekdb/2.11.x-intellij-code-inspectionsLukas Rytz2015-11-2714-31/+31
| | |\ \ \ \
| | | * | | | Apply some static code analysis recommendationsJanek Bogucki2015-11-2614-31/+31
| | |/ / / /
| * | | | | Merge commit '2890f0b' into merge-2.11-to-2.12-nov-27Lukas Rytz2015-11-270-0/+0
| |\| | | |
| | * | | | Merge pull request #4855 from szeiger/wip/sbt-osgiLukas Rytz2015-11-245-102/+413
| | |\ \ \ \
| | | * | | | [nomerge] Create a full Scala distribution from sbtStefan Zeiger2015-11-243-107/+334
| | | * | | | [nomerge] Some small fixes for generated artifacts in the sbt buildStefan Zeiger2015-11-241-3/+22
| * | | | | | Merge commit '62f346b' into merge-2.11-to-2.12-nov-27Lukas Rytz2015-11-271-3/+12
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Fix JarJar “Keep” processing in sbt buildStefan Zeiger2015-11-241-3/+12
| * | | | | | Merge commit '03607b2' into merge-2.11-to-2.12-nov-27Lukas Rytz2015-11-270-0/+0
|/| | | | | | | |/ / / / /
| * | | | | [nomerge] Build man pages and scala-dist.jar from sbtStefan Zeiger2015-11-242-1/+57
* | | | | | Merge pull request #4866 from CaseyLeask/clarify-source-of-f-functionLukas Rytz2015-11-271-1/+1
|\ \ \ \ \ \
| * | | | | | Clarify source of f functionCasey Leask2015-11-261-1/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #4867 from soc/topic/backend-cleanupLukas Rytz2015-11-275-30/+14
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Update some phase listsSimon Ochsenreither2015-11-253-12/+7
| * | | | | Remove unused cunit parameter / field in GenBCodeLukas Rytz2015-11-252-18/+7
|/ / / / /
* | | | | Merge pull request #4863 from retronym/topic/leaner-patmat-codegenLukas Rytz2015-11-242-11/+13
|\ \ \ \ \
| * | | | | DRY-er trees in pattern matcher code gen.Jason Zaugg2015-11-242-11/+13
* | | | | | Merge pull request #4864 from lrytz/merge-2.11-to-2.12-nov-24Seth Tisue2015-11-2485-542/+954
|\ \ \ \ \ \
| * | | | | | Merge commit '8eb1d4c' into merge-2.11-to-2.12-nov-24Lukas Rytz2015-11-2485-542/+954
|/| | | | | | | | |_|/ / / | |/| | | |
| * | | | | Merge pull request #4859 from fthomas/topic/spec-value-conversionsLukas Rytz2015-11-241-1/+1
| |\ \ \ \ \
| | * | | | | Update number of subsections in Value ConversionsFrank S. Thomas2015-11-231-1/+1
| * | | | | | Merge pull request #4860 from janekdb/2.11.x-scaladoc-fix-one-off-dot-restart...Lukas Rytz2015-11-241-5/+5
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Align DotRunner dot restart count with command option descriptionJanek Bogucki2015-11-231-5/+5
| * | | | | | Merge pull request #4849 from janekdb/2.11.x-remove-lagged-scaladoc-setttings...Lukas Rytz2015-11-231-2/+2
| |\ \ \ \ \ \
| | * | | | | | Remove notes about -doc-title and -doc-version not being usedJanek Bogucki2015-11-181-2/+2
| | |/ / / / /
| * | | | | | Merge pull request #4850 from janekdb/2.11.x-add-missing-scaladoc-commands-to...Lukas Rytz2015-11-231-1/+2
| |\ \ \ \ \ \
| | * | | | | | Add two missed scaladoc commands into scaladoc specific help sectionJanek Bogucki2015-11-181-1/+2
| | |/ / / / /
| * | | | | | Merge pull request #4853 from SethTisue/mima-upgradeLukas Rytz2015-11-231-1/+1
| |\ \ \ \ \ \
| | * | | | | | upgrade to MiMa 0.1.8Seth Tisue2015-11-191-1/+1
| * | | | | | | Merge pull request #4856 from janekdb/2.11.x-scaladoc-excluded-classnames-mor...Lukas Rytz2015-11-231-11/+23
| |\ \ \ \ \ \ \
| | * | | | | | | Refactor excluded qname test to be more data likeJanek Bogucki2015-11-201-11/+23
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge pull request #4857 from janekdb/2.11.x-scaladoc-fix-List-performance-ti...Lukas Rytz2015-11-231-13/+13
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Fix List Scaladoc time & space formattingJanek Bogucki2015-11-221-13/+13
| |/ / / / / /
| * | | | | | Merge pull request #4828 from retronym/topic/existential-containsLukas Rytz2015-11-165-13/+44
| |\ \ \ \ \ \
| | * | | | | | Attacking exponential complexity in TypeMapsJason Zaugg2015-11-135-13/+44
| * | | | | | | Merge pull request #4839 from SethTisue/reword-dependent-type-errorSeth Tisue2015-11-142-3/+3
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| | * | | | | | less confusing wording for a dependent method type errorSeth Tisue2015-11-072-3/+3
| | |/ / / / /
| * | | | | | Merge pull request #4824 from szeiger/wip/sbt-mkBinJason Zaugg2015-11-136-137/+394
| |\ \ \ \ \ \
| | * | | | | | Improve version handling and scaladoc generation in sbt buildStefan Zeiger2015-11-062-91/+167
| | * | | | | | Build scaladoc sets from sbtStefan Zeiger2015-11-052-23/+37