summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5140 from lrytz/inlineDefaultMethodsJason Zaugg2016-05-058-65/+200
|\
| * SD-140 inline the correct default methodLukas Rytz2016-04-288-65/+200
* | Emit a warning when a constant expression evaluates to an ArithmeticException...Olli Helenius2016-05-025-7/+15
* | SI-9752 never ignore blank lines when parsing code blocks (#5125)Antoine Gourlay2016-05-023-1/+34
* | SD-142 Avoid noisy log output in backend (#5134)Jason Zaugg2016-05-022-6/+9
* | Add examples to Exception object and group members (#5111)Janek Bogucki2016-05-021-25/+165
* | Merge pull request #5129 from retronym/ticket/9762Jason Zaugg2016-04-293-29/+11
|\ \
| * | SI-9762 Remove workaround after upstream fix in jlineJason Zaugg2016-04-271-20/+0
| * | SI-9762 Update to JLine 2.14.1Jason Zaugg2016-04-273-9/+11
| |/
* | Fix the Eclipse classpaths for 2.12.0-M4. (#5136)Performant Data2016-04-283-5/+5
* | Merge pull request #5094 from lrytz/classOfUnitAdriaan Moors2016-04-272-2/+15
|\ \ | |/ |/|
| * Fix erasure for classOf[Unit], don't erase to classOf[BoxedUnit]Lukas Rytz2016-04-202-2/+15
* | More efficient code for deciding if a mixin forwarder is needed (#5116)Lukas Rytz2016-04-258-16/+42
* | Merge pull request #5115 from lrytz/merge-2.11-to-2.12-apr-22Lukas Rytz2016-04-2516-35/+193
|\ \
| * \ Merge commit '2dd311f' into merge-2.11-to-2.12-apr-22Lukas Rytz2016-04-220-0/+0
| |\ \
| | * | 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
| | |/ /
| * | | Merge commit '684c314' into merge-2.11-to-2.12-apr-22Lukas Rytz2016-04-227-6/+90
| |\| |
| | * | 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
| * | | Merge commit '23159d2' into merge-2.11-to-2.12-apr-22Lukas Rytz2016-04-229-29/+103
| |\| |
| | * | Automate Eclipse settings and update project files: (#5091)Iulian Dragos2016-04-209-27/+101
* | | | Merge pull request #5109 from lrytz/pr5064Lukas Rytz2016-04-2373-503/+873
|\ \ \ \
| * | | | Rename the (deprecated) implicit conversion methods in JavaConversionsLukas Rytz2016-04-224-2/+59
| * | | | Cleaned up Scaladoc for JavaConverters and non-deprecated friendsLukas Rytz2016-04-227-872/+261
| * | | | SI-9684 Deprecate JavaConversionsSom Snytt2016-04-2271-152/+1076
| |/ / /
* / / / SI-9516 Fix the behavior of Int shift Long operations. (#5117)Sébastien Doeraene2016-04-233-7/+60
|/ / /
* | | CI: hardcode java path in integrate/windows scriptAdriaan Moors2016-04-211-7/+7
* | | Merge pull request #5110 from sjrd/remove-duplicate-implem-of-hashcodesLukas Rytz2016-04-2211-108/+74
|\ \ \
| * | | Remove the duplicate implem of hash codes for numbers.Sébastien Doeraene2016-04-2112-103/+61
| * | | Bring Statics.doubleHash in sync with BoxesRunTime.hashFromDouble.Sébastien Doeraene2016-04-212-13/+21
* | | | CI: fix integrate-windows scriptAdriaan Moors2016-04-211-1/+1
* | | | Merge pull request #5114 from adriaanm/ci-win-java8Adriaan Moors2016-04-211-5/+5
|\ \ \ \ | |_|_|/ |/| | |
| * | | CI: use java 8 for windows integrationAdriaan Moors2016-04-211-5/+5
|/ / /
* | | Merge pull request #5096 from lrytz/traitParentsLukas Rytz2016-04-2026-330/+639
|\ \ \
| * | | Ensure that lzycompute methods are entered into the scopeLukas Rytz2016-04-202-8/+22
| * | | Ensure ClassBTypes constructed from symbol and classfile are identicalLukas Rytz2016-04-205-34/+59
| * | | Clean up code gen for method invocationsLukas Rytz2016-04-207-218/+324
| * | | Move test run/origins.scala to pendingLukas Rytz2016-04-123-0/+0
| * | | SD-98 don't emit unnecessary mixin forwardersLukas Rytz2016-04-1212-57/+223
| * | | Rewrite JUnit tests to avoid `@Test` methods in traitsLukas Rytz2016-04-121-14/+12
* | | | scala-dev-113: Sync root package words to layout (#5107)Janek Bogucki2016-04-201-1/+1
* | | | Merge pull request #5100 from lrytz/unitBoxLukas Rytz2016-04-204-10/+133
|\ \ \ \ | |_|/ / |/| | |
| * | | SI-6710 / PR 5072 follow-up: fix Unit.box / Unit.unboxLukas Rytz2016-04-204-10/+133
| |/ /
* | | Merge pull request #5098 from sjrd/simplify-scala-runtimeLukas Rytz2016-04-2016-343/+66
|\ \ \
| * | | Remove the unused scala.runtime.Boxed trait.Sébastien Doeraene2016-04-131-12/+0
| * | | Remove plain old dead code in ScalaRunTime.Sébastien Doeraene2016-04-132-66/+0
| * | | Do not rely on ScalaRunTime.{inlineEquals,hash} in JavaMirrors.Sébastien Doeraene2016-04-131-3/+3