Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | Fixed Typo in scaladoc scheduler.js | Pim Verkerk | 2016-03-25 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #5055 from lrytz/merge-2.11-to-2.12-mar-21 | Adriaan Moors | 2016-03-23 | 27 | -230/+533 | |
|\ \ \ \ \ | ||||||
| * \ \ \ \ | Merge commit '1fcfdd8' into merge-2.11-to-2.12-mar-21 | Lukas Rytz | 2016-03-23 | 1 | -29/+33 | |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | ||||||
| | * | | | | Merge pull request #5054 from lrytz/intellij-2.112.11.x | Lukas Rytz | 2016-03-23 | 27 | -236/+507 | |
| | |\ \ \ \ | ||||||
| | | * | | | | Cleanup IntelliJ integration based on review feedback | Lukas Rytz | 2016-03-22 | 1 | -31/+35 | |
| * | | | | | | Merge commit '4ef1429' into merge-2.11-to-2.12-mar-21 | Lukas Rytz | 2016-03-23 | 0 | -0/+0 | |
| |\| | | | | | ||||||
| | * | | | | | Merge pull request #5056 from viktorklang/wip-SI9488-Future.toString-√ | Lukas Rytz | 2016-03-23 | 4 | -2/+34 | |
| | |\ \ \ \ \ | ||||||
| | | * | | | | | SI-9488 - adds the same default toString format to Scala Futures as 2.12.x | Viktor Klang | 2016-03-22 | 4 | -2/+34 | |
| | * | | | | | | Merge pull request #5026 from SethTisue/scala-xml-version-bump | Lukas Rytz | 2016-03-22 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | ||||||
| | | * | | | | | Merge branch '2.11.x' into scala-xml-version-bump | Seth Tisue | 2016-03-09 | 4 | -5/+5 | |
| | | |\ \ \ \ \ | ||||||
| | | * | | | | | | upgrade to latest scala-xml (namely 1.0.5) | Seth Tisue | 2016-03-08 | 1 | -1/+1 | |
| * | | | | | | | | Updates to IntelliJ files for 2.12.x | Lukas Rytz | 2016-03-21 | 3 | -34/+41 | |
| * | | | | | | | | Merge commit '5f5cc18' into merge-2.11-to-2.12-mar-21 | Lukas Rytz | 2016-03-21 | 27 | -230/+522 | |
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | ||||||
| | * | | | | | | | Update IntelliJ build for use with sbt | Lukas Rytz | 2016-03-21 | 27 | -236/+503 | |
| | |/ / / / / / | ||||||
| * | | | | | | | Merge commit 'afb1458' into merge-2.11-to-2.12-mar-21 | Lukas Rytz | 2016-03-21 | 0 | -0/+0 | |
| |\| | | | | | | ||||||
| | * | | | | | | Merge pull request #5030 from SethTisue/newer-akka | Adriaan Moors | 2016-03-15 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | ||||||
| | | * | | | | | Merge branch '2.11.x' into newer-akka | Seth Tisue | 2016-03-09 | 4 | -5/+5 | |
| | | |\ \ \ \ \ | | | |/ / / / / | | |/| | | | | | ||||||
| | | * | | | | | bundle a newer Akka actors jar | Seth Tisue | 2016-03-09 | 1 | -1/+1 | |
| | | |/ / / / | ||||||
* | | | | | | | Merge pull request #5051 from kmizu/improve-api-docs | Adriaan Moors | 2016-03-23 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Add scaladoc comment about the case when Exception will be thrown by invocati... | Kota Mizushima | 2016-03-24 | 1 | -0/+1 | |
| | |_|_|/ / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #5053 from som-snytt/issue/9314 | Lukas Rytz | 2016-03-23 | 3 | -20/+57 | |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | ||||||
| * | | | | | | SI-9314 No warn on ${nonid} | Som Snytt | 2016-03-23 | 3 | -13/+36 | |
| * | | | | | | SI-9314 Ignore "${}" | Som Snytt | 2016-03-20 | 2 | -3/+7 | |
| * | | | | | | SI-9314 Don't warn on "$pkg" | Som Snytt | 2016-03-20 | 3 | -9/+19 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #5057 from lrytz/flatClasspath | Lukas Rytz | 2016-03-23 | 18 | -230/+384 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Support :require when using the flat classpath representation. | Lukas Rytz | 2016-03-22 | 9 | -110/+221 | |
| * | | | | | | Enable flat classpath by default | Lukas Rytz | 2016-03-22 | 10 | -120/+163 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | Merge pull request #5047 from kmizu/resolve-several-warnings | Adriaan Moors | 2016-03-22 | 6 | -12/+12 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Resolve warnings related to SyncVar#set | Kota Mizushima | 2016-03-18 | 3 | -9/+9 | |
| * | | | | | | * Replace isPackage with hasPackageFlag | Kota Mizushima | 2016-03-17 | 2 | -2/+2 | |
| * | | | | | | Fix one warning in Util.scala | Kota Mizushima | 2016-03-17 | 1 | -1/+1 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | Merge pull request #5034 from janekdb/topic/2.12.x-scaladoc-Predef-method-groups | Seth Tisue | 2016-03-21 | 1 | -0/+106 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | Organise Predef members into Scaladoc groups | Janek Bogucki | 2016-03-16 | 1 | -0/+106 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #5043 from dongjoon-hyun/fix_typos_in_spec_and_comments | Jason Zaugg | 2016-03-21 | 28 | -34/+34 | |
|\ \ \ \ \ | ||||||
| * | | | | | Fix some typos in `spec` documents and comments. | Dongjoon Hyun | 2016-03-15 | 28 | -34/+34 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #5049 from janekdb/topic/2.12.x-bump-sbt-compiler-interfac... | Jason Zaugg | 2016-03-21 | 1 | -2/+2 | |
|\ \ \ \ \ | ||||||
| * | | | | | Update sbt version to most recent release | Janek Bogucki | 2016-03-17 | 1 | -2/+2 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #5003 from retronym/topic/nuke-impl-classes-sans-fields | Adriaan Moors | 2016-03-20 | 88 | -1428/+513 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Update STARR after bootstrapping the new trait encoding | Jason Zaugg | 2016-03-18 | 1 | -2/+2 | |
| * | | | | Remove manual mixins in JFunctionN.v2.12.0-M3-dc9effe | Jason Zaugg | 2016-03-18 | 48 | -528/+197 | |
| * | | | | New trait encoding: use default methods, jettison impl classes | Jason Zaugg | 2016-03-18 | 41 | -893/+294 | |
| * | | | | Skip module docs in first round of bootstrap when STARR_REF is used | Jason Zaugg | 2016-03-18 | 1 | -5/+20 | |
|/ / / / | ||||||
* | | | | Merge pull request #5037 from janekdb/topic/2.12.x-scaladoc-fix-Source-links | Adriaan Moors | 2016-03-14 | 1 | -10/+8 | |
|\ \ \ \ | ||||||
| * | | | | Fix Scaladoc links in scala.io.Source | Janek Bogucki | 2016-03-13 | 1 | -10/+8 | |
| | |_|/ | |/| | | ||||||
* | | | | Merge pull request #4974 from szeiger/wip/patmat-outertest | Adriaan Moors | 2016-03-14 | 12 | -68/+204 | |
|\ \ \ \ | ||||||
| * | | | | Improved outer ref checking in pattern matches: | Adriaan Moors | 2016-03-07 | 12 | -68/+204 | |
* | | | | | Merge pull request #5040 from adriaanm/rebase-5031 | Jason Zaugg | 2016-03-15 | 16 | -118/+198 | |
|\ \ \ \ \ | ||||||
| * \ \ \ \ | Skip merging 2.11.x's #5025 into 2.12.x | Adriaan Moors | 2016-03-14 | 0 | -0/+0 | |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | ||||||
| | * | | | | Merge pull request #5025 from SethTisue/next-is-2-11-9 | Seth Tisue | 2016-03-09 | 4 | -5/+5 | |
| | |\ \ \ \ | | | |_|_|/ | | |/| | | | ||||||
| | | * | | | bump versions after 2.11.8 release | Seth Tisue | 2016-03-08 | 4 | -5/+5 | |
| | |/ / / |