summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5152 from retronym/topic/silencioJason Zaugg2016-05-173-9/+46
|\
| * [backport] sbt build targets build/Adriaan Moors2016-05-171-5/+5
| * Eliminate major sources of daily noise in SBT build.Jason Zaugg2016-05-163-4/+41
* | Merge pull request #5090 from som-snytt/issue/9740-repl-bad-importLukas Rytz2016-05-118-92/+80
|\ \
| * | SI-9740 Repl import fix -Yrepl-class-basedSom Snytt2016-05-028-92/+80
| |/
* | Merge pull request #5128 from szeiger/wip/sbt-ivy-2.11Jason Zaugg2016-05-112-26/+53
|\ \ | |/ |/|
| * Publish usable Scala distributions to Ivy repositoriesStefan Zeiger2016-05-062-26/+53
* | Merge pull request #5139 from SethTisue/disable-integrate-ideAdriaan Moors2016-04-281-0/+4
|\ \
| * | disable integrate/ide script on 2.11.xSeth Tisue2016-04-281-0/+4
* | | CI: hardcode java path in integrate/windows scriptAdriaan Moors2016-04-211-5/+6
* | | Merge pull request #5113 from adriaanm/ci-win-java6Adriaan Moors2016-04-211-0/+3
|\ \ \
| * | | CI: use java 6 for windows integrationAdriaan Moors2016-04-211-0/+3
|/ / /
* | | SI-9734 Narrow type when import REPL history (#5084)som-snytt2016-04-203-1/+41
* | | SI-9735 REPL prefer standard escapes for code text (#5086)som-snytt2016-04-203-4/+48
* | | Updating README.md Eclipse version reference. (#5092)CodingTwinky2016-04-201-1/+1
* | | Automate Eclipse settings and update project files: (#5091)Iulian Dragos2016-04-209-27/+101
|/ /
* | Merge pull request #5054 from lrytz/intellij-2.112.11.xLukas Rytz2016-03-2327-236/+507
|\ \
| * | Cleanup IntelliJ integration based on review feedbackLukas Rytz2016-03-221-31/+35
| * | Update IntelliJ build for use with sbtLukas Rytz2016-03-2127-236/+503
| |/
* | Merge pull request #5056 from viktorklang/wip-SI9488-Future.toString-√Lukas Rytz2016-03-234-2/+34
|\ \
| * | SI-9488 - adds the same default toString format to Scala Futures as 2.12.xViktor Klang2016-03-224-2/+34
| |/
* | Merge pull request #5026 from SethTisue/scala-xml-version-bumpLukas Rytz2016-03-221-1/+1
|\ \ | |/ |/|
| * Merge branch '2.11.x' into scala-xml-version-bumpSeth Tisue2016-03-094-5/+5
| |\
| * | upgrade to latest scala-xml (namely 1.0.5)Seth Tisue2016-03-081-1/+1
* | | Merge pull request #5030 from SethTisue/newer-akkaAdriaan Moors2016-03-151-1/+1
|\ \ \ | |_|/ |/| |
| * | Merge branch '2.11.x' into newer-akkaSeth Tisue2016-03-094-5/+5
| |\ \ | |/ / |/| |
* | | Merge pull request #5025 from SethTisue/next-is-2-11-9Seth Tisue2016-03-094-5/+5
|\ \ \ | |_|/ |/| |
| * | bump versions after 2.11.8 releaseSeth Tisue2016-03-084-5/+5
|/ /
| * bundle a newer Akka actors jarSeth Tisue2016-03-091-1/+1
|/
* Merge pull request #5005 from janekdb/2.11.x-man-page-scalacv2.11.8Seth Tisue2016-03-041-25/+26
|\
| * Document -Xxml:coalescing in scalac man pageJanek Bogucki2016-03-031-25/+26
* | Merge pull request #4994 from dk14/patch-1Seth Tisue2016-03-041-1/+1
|\ \
| * | explicitly specify insertion-order feature in docsdk142016-02-231-1/+1
* | | Merge pull request #5006 from SethTisue/more-cowbell-more-lightbendSeth Tisue2016-03-045-6/+6
|\ \ \
| * | | Typesafe -> Lightbend in more placesSeth Tisue2016-03-045-6/+6
|/ / /
* | | Merge pull request #5002 from retronym/ticket/9546Lukas Rytz2016-03-046-29/+107
|\ \ \ | |_|/ |/| |
| * | SI-9425 Fix a residual bug with multi-param-list case classesJason Zaugg2016-03-042-3/+25
| * | SI-9546 Fix regression in rewrite of case apply to constructor callJason Zaugg2016-03-022-4/+16
| * | Refactor transform of case apply in refchecksJason Zaugg2016-03-024-28/+72
|/ /
* | Merge pull request #5000 from felixmulder/patch-2Seth Tisue2016-03-011-1/+1
|\ \
| * | Fix bold text in reflect API for 2.11.xFelix Mulder2016-02-271-1/+1
|/ /
* | Merge pull request #4993 from SethTisue/sbt-0.13.11Seth Tisue2016-02-263-48/+48
|\ \
| * | upgrade to sbt 0.13.11Seth Tisue2016-02-223-48/+48
* | | Merge pull request #4995 from SethTisue/typesafe-is-now-lightbendSeth Tisue2016-02-2414-25/+25
|\ \ \
| * | | Typesafe is now LightbendSeth Tisue2016-02-2414-25/+25
* | | | Merge pull request #4975 from szeiger/wip/backport-partest-0.13-to-2.11.xSeth Tisue2016-02-239-20/+17
|\ \ \ \ | |/ / / |/| | |
| * | | Update to partest 1.0.13Jason Zaugg2016-02-173-18/+3
| * | | Update partest to 1.0.12, test case for reporting invalid flagsLukas Rytz2016-02-177-3/+15
* | | | Merge pull request #4992 from joeratt/issue/9664Seth Tisue2016-02-221-2/+2
|\ \ \ \
| * | | | [SI-9664] - Updating README.md's IntelliJ version reference.JoeRatt2016-02-221-2/+2