summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | Merge pull request #2882 from adriaanm/license-cleanup-2.10.xGrzegorz Kossakowski2013-09-111-32/+24
|\ \ \ \ \ \
| * | | | | | Change Scala license to unmodified 3-clause BSD.Adriaan Moors2013-09-031-32/+24
* | | | | | | Merge pull request #2923 from retronym/ticket/7825Grzegorz Kossakowski2013-09-116-6/+73
|\ \ \ \ \ \ \
| * | | | | | | SI-7398 Enable test for Java 8 source parser under Java 8Jason Zaugg2013-09-101-4/+2
| * | | | | | | SI-7825 Consider DEFAULTMETHOD when refchecking concretenessJason Zaugg2013-09-105-2/+71
* | | | | | | | Merge pull request #2916 from retronym/ticket/7818Jason Zaugg2013-09-102-1/+16
|\ \ \ \ \ \ \ \
| * | | | | | | | SI-7818 Cast our way out of extended existential angstJason Zaugg2013-09-062-1/+16
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge pull request #2922 from huitseeker/issue/7767Jason Zaugg2013-09-103-0/+21
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge pull request #1 from retronym/ticket/7767-testFrançois Garillot2013-09-092-0/+19
| |\ \ \ \ \ \ \ \
| | * | | | | | | | SI-7767 Test case for Scaladoc on early initializersJason Zaugg2013-09-092-0/+21
| |/ / / / / / / /
| * | / / / / / / SI-7767 avoid rejecting Scaladoc comments in early initializersFrançois Garillot2013-09-091-0/+2
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #2866 from retronym/ticket/7269Jason Zaugg2013-09-093-3/+37
|\ \ \ \ \ \ \ \
| * | | | | | | | SI-7269 Rework MapLike#retains to account for desugaring changeJason Zaugg2013-08-293-3/+37
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge pull request #2911 from retronym/ticket/7814Jason Zaugg2013-09-097-167/+214
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | SI-7814 Updates the instrumented version of ScalaRuntime.Jason Zaugg2013-09-055-156/+70
| * | | | | | | SI-7814 Avoid init cycle between Predef, `package`, ScalaRuntimeJason Zaugg2013-09-053-11/+144
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #2895 from som-snytt/issue/7652-tools-jar-backportGrzegorz Kossakowski2013-09-082-13/+24
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | [nomaster] SI-7652 REPL extended quest for toolsSom Snytt2013-08-291-12/+23
| * | | | | | [nomaster] SI-7652 Bad tools fails loudlySom Snytt2013-08-291-1/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #2888 from xeno-by/topic/typed-annotatedJason Zaugg2013-09-044-1/+22
|\ \ \ \ \ \
| * | | | | | typedAnnotated no longer emits nullsEugene Burmako2013-08-294-1/+22
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #2901 from gkossakowski/backport-uniques-memory-fixGrzegorz Kossakowski2013-09-046-54/+1446
|\ \ \ \ \ \
| * | | | | | Modify perRunCaches to not leak WeakReferencesJames Iry2013-09-031-10/+3
| * | | | | | SI-7149 Use a WeakHashSet for type uniquenessGrzegorz Kossakowski2013-09-033-2/+50
| * | | | | | SI-7150 Replace scala.reflect.internal.WeakHashSetGrzegorz Kossakowski2013-09-034-42/+1393
* | | | | | | Merge pull request #2876 from retronym/ticket/7782Jason Zaugg2013-09-043-1/+58
|\ \ \ \ \ \ \
| * | | | | | | SI-7782 Derive type skolems at the ground levelJason Zaugg2013-08-273-1/+58
* | | | | | | | Merge pull request #2899 from som-snytt/issue/4760-parserJason Zaugg2013-09-042-1/+35
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | SI-4760 Parser handles block-ending importSom Snytt2013-08-302-1/+35
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #2891 from som-snytt/issue/7790-no-scriptengineJason Zaugg2013-08-301-0/+2
|\ \ \ \ \ \ \
| * | | | | | | [nomaster] SI-7790 No ScriptEngine in 2.10 buildSom Snytt2013-08-291-0/+2
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #2897 from retronym/backport/gitignoreJason Zaugg2013-08-303-35/+48
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Commit .gitignore directlyJason Zaugg2013-08-303-35/+48
|/ / / / / /
* | | | | | Merge pull request #2868 from retronym/ticket/7775Jason Zaugg2013-08-292-2/+23
|\ \ \ \ \ \
| * | | | | | SI-7775 Harden against the shifting sands of System.getPropertiesJason Zaugg2013-08-262-2/+23
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #2871 from retronym/ticket/7779Jason Zaugg2013-08-295-0/+98
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | SI-7779 Account for class name compactification in reflectionJason Zaugg2013-08-235-0/+98
| |/ / / /
* | | | | Merge pull request #2860 from retronym/merge/2.10.2-to-2.10.xJames Iry2013-08-2618-30/+108
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | SI-7486 More tests for cycles triggered by implicit searchJason Zaugg2013-08-212-0/+8
| * | | | Merge remote-tracking branch 'origin/2.10.2' into merge/2.10.2-to-2.10.xJason Zaugg2013-08-2118-30/+100
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/|
| | * | Merge pull request #2608 from retronym/ticket/7532v2.10.2-RC2v2.10.2James Iry2013-05-305-4/+30
| | |\ \
| | | * | SI-7532 Fix regression in Java inner classfile readerJason Zaugg2013-05-305-4/+30
| | * | | Merge pull request #2607 from retronym/ticket/7517James Iry2013-05-292-4/+25
| | |\ \ \ | | | |/ / | | |/| |
| | | * | SI-7517 Fix higher kinded type inference regressionJason Zaugg2013-05-302-4/+25
| | |/ /
| | * | Merge pull request #2601 from retronym/ticket/7516James Iry2013-05-295-5/+20
| | |\ \
| | | * | SI-7516 Revert "SI-7234 Make named args play nice w. depmet types"Jason Zaugg2013-05-295-5/+20
| | * | | Merge pull request #2590 from paulp/issue/7486Jason Zaugg2013-05-274-14/+3
| | |\ \ \ | | | |/ / | | |/| |
| | | * | SI-7486 Regressions in implicit search.Paul Phillips2013-05-234-14/+3
| | * | | Merge pull request #2588 from retronym/ticket/7509Paul Phillips2013-05-263-3/+22
| | |\ \ \ | | | |/ / | | |/| |
| | | * | SI-7509 Avoid crasher as erronous args flow through NamesDefaultsJason Zaugg2013-05-233-3/+22
| | |/ /