summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Note the availability of writableStackTrace in JDK 1.7+Jason Zaugg2016-03-291-0/+2
* SI-7474 Record extra errors in Throwable#suppressedExceptionsJason Zaugg2016-03-293-12/+16
* Delegate more primitive comparison to the Java stdlibJason Zaugg2016-03-291-16/+6
* Avoid intermediate boxing in BoxesRuntime.hashCodeFromJason Zaugg2016-03-291-3/+3
* Merge pull request #5050 from code-star/topic/2.12.x-scaladoc-Auto-expandVlad Ureche2016-03-252-26/+31
|\
| * scaladoc fix permalinksDavid Hoepelman2016-03-251-25/+30
| * Fixed Typo in scaladoc scheduler.jsPim Verkerk2016-03-251-1/+1
|/
* Merge pull request #5055 from lrytz/merge-2.11-to-2.12-mar-21Adriaan Moors2016-03-2327-230/+533
|\
| * Merge commit '1fcfdd8' into merge-2.11-to-2.12-mar-21Lukas Rytz2016-03-231-29/+33
| |\
| | * 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
| * | | Merge commit '4ef1429' into merge-2.11-to-2.12-mar-21Lukas Rytz2016-03-230-0/+0
| |\| |
| | * | 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
| * | | | | Updates to IntelliJ files for 2.12.xLukas Rytz2016-03-213-34/+41
| * | | | | Merge commit '5f5cc18' into merge-2.11-to-2.12-mar-21Lukas Rytz2016-03-2127-230/+522
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Update IntelliJ build for use with sbtLukas Rytz2016-03-2127-236/+503
| | |/ / /
| * | | | Merge commit 'afb1458' into merge-2.11-to-2.12-mar-21Lukas Rytz2016-03-210-0/+0
| |\| | |
| | * | | 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
| | | |\ \ | | | |/ / | | |/| |
| | | * | bundle a newer Akka actors jarSeth Tisue2016-03-091-1/+1
| | | |/
* | | | Merge pull request #5051 from kmizu/improve-api-docsAdriaan Moors2016-03-231-0/+1
|\ \ \ \
| * | | | Add scaladoc comment about the case when Exception will be thrown by invocati...Kota Mizushima2016-03-241-0/+1
* | | | | Merge pull request #5053 from som-snytt/issue/9314Lukas Rytz2016-03-233-20/+57
|\ \ \ \ \
| * | | | | SI-9314 No warn on ${nonid}Som Snytt2016-03-233-13/+36
| * | | | | SI-9314 Ignore "${}"Som Snytt2016-03-202-3/+7
| * | | | | SI-9314 Don't warn on "$pkg"Som Snytt2016-03-203-9/+19
| |/ / / /
* | | | | Merge pull request #5057 from lrytz/flatClasspathLukas Rytz2016-03-2318-230/+384
|\ \ \ \ \
| * | | | | Support :require when using the flat classpath representation.Lukas Rytz2016-03-229-110/+221
| * | | | | Enable flat classpath by defaultLukas Rytz2016-03-2210-120/+163
| | |/ / / | |/| | |
* | | | | Merge pull request #5047 from kmizu/resolve-several-warningsAdriaan Moors2016-03-226-12/+12
|\ \ \ \ \
| * | | | | Resolve warnings related to SyncVar#setKota Mizushima2016-03-183-9/+9
| * | | | | * Replace isPackage with hasPackageFlagKota Mizushima2016-03-172-2/+2
| * | | | | Fix one warning in Util.scalaKota Mizushima2016-03-171-1/+1
| | |/ / / | |/| | |
* | | | | Merge pull request #5034 from janekdb/topic/2.12.x-scaladoc-Predef-method-groupsSeth Tisue2016-03-211-0/+106
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Organise Predef members into Scaladoc groupsJanek Bogucki2016-03-161-0/+106
| |/ / /
* | | | Merge pull request #5043 from dongjoon-hyun/fix_typos_in_spec_and_commentsJason Zaugg2016-03-2128-34/+34
|\ \ \ \
| * | | | Fix some typos in `spec` documents and comments.Dongjoon Hyun2016-03-1528-34/+34
| |/ / /
* | | | Merge pull request #5049 from janekdb/topic/2.12.x-bump-sbt-compiler-interfac...Jason Zaugg2016-03-211-2/+2
|\ \ \ \
| * | | | Update sbt version to most recent releaseJanek Bogucki2016-03-171-2/+2
| |/ / /
* | | | Merge pull request #5003 from retronym/topic/nuke-impl-classes-sans-fieldsAdriaan Moors2016-03-2088-1428/+513
|\ \ \ \ | |/ / / |/| | |
| * | | Update STARR after bootstrapping the new trait encodingJason Zaugg2016-03-181-2/+2
| * | | Remove manual mixins in JFunctionN.v2.12.0-M3-dc9effeJason Zaugg2016-03-1848-528/+197
| * | | New trait encoding: use default methods, jettison impl classesJason Zaugg2016-03-1841-893/+294
| * | | Skip module docs in first round of bootstrap when STARR_REF is usedJason Zaugg2016-03-181-5/+20
|/ / /
* | | Merge pull request #5037 from janekdb/topic/2.12.x-scaladoc-fix-Source-linksAdriaan Moors2016-03-141-10/+8
|\ \ \
| * | | Fix Scaladoc links in scala.io.SourceJanek Bogucki2016-03-131-10/+8