summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
* | 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
| * | | Move ScalaRunTime.box to typechecker.Macros.Sébastien Doeraene2016-04-132-15/+14
| * | | Inline ScalaRunTime.arrayElementClass at call sites.Sébastien Doeraene2016-04-137-33/+11
| * | | Move ScalaRunTime.isAnyVal to reify.phases.Reify.Sébastien Doeraene2016-04-133-11/+5
| * | | Hide ScalaRunTime.isTuple inside stringOf.Sébastien Doeraene2016-04-133-65/+10
| * | | Remove dead-code runtime hash() methods.Sébastien Doeraene2016-04-136-94/+5
| * | | Inline ArrayRuntime methods in ScalaRunTime.array_clone().Sébastien Doeraene2016-04-133-44/+18
| |/ /
* / / SI-9749 REPL strip lead ws on dot continuation (#5097)som-snytt2016-04-153-7/+25
|/ /
* | Merge pull request #5082 from lrytz/inlineImplClassCleanupLukas Rytz2016-04-0719-338/+164
|\ \
| * | Fix InlineInfo attribute for nested module accessorsLukas Rytz2016-04-072-34/+74
| * | Remove references to trait impl classes, mostly in doc commentsLukas Rytz2016-04-0711-85/+49
| * | Remove unused optimizer warnings related to trait impl classesLukas Rytz2016-04-042-30/+0
| * | Remove dead code in the optimizer related to trait impl classesLukas Rytz2016-04-048-209/+61
* | | Merge pull request #5087 from sh0hei/delete_unnecessary_blank_lineAdriaan Moors2016-04-071-2/+0
|\ \ \
| * | | Delete unnecessary blank linesh0hei2016-04-071-2/+0
|/ / /
* | | Generate AnyVal source stubs from sbtStefan Zeiger2016-04-0615-114/+43
* | | Merge pull request #5081 from adriaanm/2.12.xAdriaan Moors2016-04-041-2/+2
|\ \ \
| * | | Bump STARR to 2.12.0-M4.Adriaan Moors2016-04-041-2/+2
* | | | General cleanups and less warnings during a Scala buildsoc2016-04-0448-128/+80
|/ / /
* | | SI-6710 Clarify stub methods in primitive value classesLukas Rytz2016-04-0410-39/+47
|\ \ \