summaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge 2.10.x into masterAdriaan Moors2013-06-282-5/+15
|\
| * Merge pull request #2680 from retronym/ticket/7603Adriaan Moors2013-06-271-3/+12
| |\
| | * SI-7603 Speculative fix for annotation binding errorJason Zaugg2013-06-241-3/+12
| * | Merge pull request #2686 from retronym/topic/partest-task-no-stack-traceAdriaan Moors2013-06-271-2/+3
| |\ \
| | * | Less noise on a partest failure.Jason Zaugg2013-06-271-2/+3
| | |/
| * | Merge pull request #2655 from VladUreche/issue/7344Adriaan Moors2013-06-261-24/+94
| |\ \
| | * | SI-7344 Specialize methods in private scopesVlad Ureche2013-06-251-24/+94
| | |/
* | | Merge 2.10.x into masterAdriaan Moors2013-06-285-140/+78
|\| |
| * | Merge pull request #2648 from retronym/ticket/7571Grzegorz Kossakowski2013-06-251-2/+2
| |\ \
| | * | SI-7571 Allow nesting of anonymous classes in value classesJason Zaugg2013-06-191-2/+2
| * | | Merge pull request #2511 from viktorklang/wip-cleaner-Future-method-implement...Adriaan Moors2013-06-241-137/+44
| |\ \ \ | | |_|/ | |/| |
| | * | Cleaning up method implementations in FutureViktor Klang2013-06-191-137/+44
| * | | Merge pull request #2651 from VladUreche/issue/7343-2Adriaan Moors2013-06-182-20/+33
| |\ \ \
| | * | | SI-7343 Fixed phase ordering in specializationVlad Ureche2013-06-122-2/+31
| | * | | Removed redundant `retypedMethod` in `Duplicators`Vlad Ureche2013-06-121-18/+2
| | | |/ | | |/|
* | | | SI-7344 Specialize methods in private scopesVlad Ureche2013-06-281-23/+91
* | | | Merge pull request #2679 from soc/topic/java-rawtype-cleanupAdriaan Moors2013-06-273-5/+6
|\ \ \ \
| * | | | Get rid of raw types which cause unnecessary warningsSimon Ochsenreither2013-06-233-5/+6
* | | | | Merge pull request #2669 from adriaanm/modularize-parsingAdriaan Moors2013-06-279-104/+84
|\ \ \ \ \
| * | | | | Remove dependency on combinators from CommandLinerParser.Adriaan Moors2013-06-259-104/+84
* | | | | | Merge pull request #2672 from som-snytt/issue/6855-repl-pasted-braceAdriaan Moors2013-06-251-2/+14
|\ \ \ \ \ \
| * | | | | | SI-6855: REPL emits error on partial pastieSom Snytt2013-06-221-2/+14
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #2659 from retronym/ticket/7584Adriaan Moors2013-06-251-2/+9
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | SI-7584 Test and spurious warning fix for by-name closuresJason Zaugg2013-06-161-1/+1
| * | | | | SI-7584 Fix typer regression with by-name parameter typesJason Zaugg2013-06-161-1/+8
* | | | | | Merge pull request #2667 from adriaanm/modularize-xmlAdriaan Moors2013-06-2420-97/+593
|\ \ \ \ \ \
| * | | | | | Set scene for Predef.$scope's demise.Jason Zaugg2013-06-209-13/+80
| * | | | | | Remove dependency on xml in ast.parserAdriaan Moors2013-06-205-14/+441
| * | | | | | Remove dependency on xml in MarkupParsersAdriaan Moors2013-06-201-6/+14
| * | | | | | Remove dependency on xml in plugin loading.Adriaan Moors2013-06-202-39/+31
| * | | | | | Remove dependency on xml in ScalaRunTime.Adriaan Moors2013-06-201-4/+3
| * | | | | | Remove dependency on xml in sys.process.Adriaan Moors2013-06-203-21/+24
* | | | | | | SI-7569 Fix end position in PostfixSelect treeFrançois Garillot2013-06-241-1/+1
* | | | | | | Merge pull request #2653 from retronym/ticket/7433Grzegorz Kossakowski2013-06-232-1/+13
|\ \ \ \ \ \ \
| * | | | | | | SI-7433 Fix spurious warning about catching control throwableJason Zaugg2013-06-232-1/+13
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #2637 from retronym/ticket/7439Paul Phillips2013-06-231-1/+3
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | SI-7439 Avoid NPE in `isMonomorphicType` with stub symbols.Jason Zaugg2013-06-131-1/+3
* | | | | | | Merge pull request #2342 from soc/SI-7292Adriaan Moors2013-06-201-0/+7
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | SI-7292 Deprecate octal escape literalsSimon Ochsenreither2013-04-041-0/+7
* | | | | | | Merge pull request #2625 from paulp/pr/no-useless-implicitsGrzegorz Kossakowski2013-06-193-38/+25
|\ \ \ \ \ \ \
| * | | | | | | SI-6899, prohibit dangerous, useless implicit conversions.Paul Phillips2013-06-043-38/+25
* | | | | | | | Merge pull request #2628 from retronym/ticket/7364Eugene Burmako2013-06-191-5/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | SI-7364 Allow raw types in parent position in Java sourcesJason Zaugg2013-06-091-5/+8
* | | | | | | | | Merge pull request #2635 from retronym/ticket/7151Grzegorz Kossakowski2013-06-191-2/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | SI-7151 Emit final in bytecode for final inner classes.Jason Zaugg2013-06-071-2/+3
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #2631 from retronym/ticket/5022Grzegorz Kossakowski2013-06-191-2/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | SI-5022 Retain precise existentials through pattern matchingJason Zaugg2013-06-051-2/+7
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #2657 from gkossakowski/junit-masterGrzegorz Kossakowski2013-06-193-0/+50
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'scala-2.10.x/junit' into masterGrzegorz Kossakowski2013-06-163-0/+50
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | / / / | | | |_|_|_|/ / / | | |/| | | | | |
| | * | | | | | | Add Eclipse project for JUnit tests.Grzegorz Kossakowski2013-06-153-0/+50
| | | |_|_|_|/ / | | |/| | | | |