Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
* | Merge remote tracking branch 'origin/2.10.x' into topic/merge-2.10.x-to-v2.11... | Jason Zaugg | 2013-04-02 | 6 | -0/+155 | |
|\ | ||||||
| * | Merge pull request #2292 from retronym/ticket/7285 | Adriaan Moors | 2013-03-27 | 2 | -0/+84 | |
| |\ | ||||||
| | * | SI-7285 Fix match analysis with nested objects. | Jason Zaugg | 2013-03-23 | 2 | -0/+84 | |
| * | | SI-6210 Test case for already-fixed pattern matcher bug | Jason Zaugg | 2013-03-23 | 2 | -0/+22 | |
| |/ | ||||||
| * | Merge pull request #2269 from retronym/ticket/7259 | James Iry | 2013-03-20 | 4 | -0/+14 | |
| |\ | ||||||
| | * | SI-7259 Fix detection of Java defined Selects | Jason Zaugg | 2013-03-16 | 4 | -0/+14 | |
| * | | Merge pull request #2253 from retronym/ticket/7239 | Adriaan Moors | 2013-03-17 | 2 | -0/+49 | |
| |\ \ | ||||||
| | * | | SI-6921 SI-7239 Tread lightly during exploratory typing | Jason Zaugg | 2013-03-13 | 2 | -0/+49 | |
| | |/ | ||||||
| * | | Merge pull request #2247 from retronym/ticket/7232-2 | Adriaan Moors | 2013-03-17 | 15 | -0/+70 | |
| |\ \ | | |/ | |/| | ||||||
| | * | SI-7232 Fix Java import vs defn. binding precendence | Jason Zaugg | 2013-03-13 | 15 | -0/+70 | |
* | | | Merge pull request #2317 from retronym/ticket/7232-master | Adriaan Moors | 2013-04-01 | 15 | -0/+70 | |
|\ \ \ | ||||||
| * | | | SI-7232 Fix Java import vs defn. binding precendence | Jason Zaugg | 2013-03-26 | 15 | -0/+70 | |
* | | | | Merge pull request #2318 from retronym/ticket/7259-master | Adriaan Moors | 2013-04-01 | 4 | -0/+14 | |
|\ \ \ \ | ||||||
| * | | | | SI-7259 Fix detection of Java defined Selects | Jason Zaugg | 2013-03-26 | 4 | -0/+14 | |
| |/ / / | ||||||
* | | | | Merge pull request #2305 from retronym/ticket/7296-2 | Adriaan Moors | 2013-03-29 | 2 | -0/+9 | |
|\ \ \ \ | ||||||
| * | | | | SI-7296 Remove arity limit for case classes | Jason Zaugg | 2013-03-25 | 2 | -0/+9 | |
* | | | | | Merge commit '395e90a786' into pr/merge-395e90a786 | Paul Phillips | 2013-03-28 | 2 | -0/+22 | |
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| | | ||||||
| * | | | Merge pull request #2230 from retronym/ticket/7233 | Paul Phillips | 2013-03-12 | 2 | -0/+22 | |
| |\ \ \ | ||||||
| | * | | | SI-7233 Account for aliased imports in Erasure | Jason Zaugg | 2013-03-10 | 1 | -0/+8 | |
| | * | | | SI-7233 Account for aliased imports in eta expansion. | Jason Zaugg | 2013-03-10 | 1 | -0/+14 | |
| | | |/ | | |/| | ||||||
* | | | | SI-7294 Treat TupleN as final under -Xfuture | Jason Zaugg | 2013-03-24 | 1 | -0/+6 | |
| |_|/ |/| | | ||||||
* | | | Merge pull request #2259 from Blaisorblade/issue/6123-try-3 | Paul Phillips | 2013-03-22 | 4 | -0/+22 | |
|\ \ \ | ||||||
| * | | | Add positive and negative testcases for SI-6123 (-explaintypes) | Paolo G. Giarrusso | 2013-03-15 | 4 | -0/+22 | |
* | | | | SI-7247, deprecated NotNull. | Paul Phillips | 2013-03-13 | 2 | -16/+0 | |
|/ / / | ||||||
* | | | Merge pull request #2215 from paulp/issue/7228 | Paul Phillips | 2013-03-13 | 3 | -19/+76 | |
|\ \ \ | ||||||
| * | | | Simplified the widening logic. | Paul Phillips | 2013-03-10 | 2 | -19/+1 | |
| * | | | SI-7228, bug in weak subtyping. | Paul Phillips | 2013-03-10 | 1 | -0/+75 | |
* | | | | Merge 2.10.x into master | Adriaan Moors | 2013-03-12 | 3 | -0/+61 | |
|\ \ \ \ | |/ / / |/| / / | |/ / | ||||||
| * | | Merge pull request #2225 from retronym/ticket/7234 | Adriaan Moors | 2013-03-11 | 2 | -0/+35 | |
| |\ \ | ||||||
| | * | | SI-7234 Make named args play nice with dep. method types | Jason Zaugg | 2013-03-09 | 2 | -0/+35 | |
| | |/ | ||||||
| * / | SI-7226 Fix inference regression caused by TypeVar equality. | Jason Zaugg | 2013-03-09 | 1 | -0/+26 | |
| |/ | ||||||
* | | Merge 2.10.x into master. | Adriaan Moors | 2013-03-05 | 2 | -0/+14 | |
|\| | ||||||
| * | Merge pull request #2193 from adriaanm/patmat-refactor | Adriaan Moors | 2013-03-05 | 3 | -0/+25 | |
| |\ | ||||||
| | * | Merge 2.10.1 into 2.10.x | Adriaan Moors | 2013-03-03 | 1 | -0/+11 | |
| | |\ | ||||||
| | | * | Merge pull request #2168 from retronym/ticket/7183 | Adriaan Moors | 2013-03-01 | 2 | -0/+14 | |
| | | |\ | ||||||
| | | | * | SI-7183 Disable unreachability for withFilter matches. | Jason Zaugg | 2013-02-25 | 2 | -0/+14 | |
| | * | | | [port] SI-7183 Disable unreachability for withFilter matches. | Adriaan Moors | 2013-03-03 | 2 | -0/+14 | |
* | | | | | Merge 2.10.x into master. | Adriaan Moors | 2013-03-05 | 1 | -0/+26 | |
|\| | | | | ||||||
| * | | | | Merge pull request #2178 from scalamacros/ticket/7190 | Paul Phillips | 2013-03-05 | 1 | -0/+26 | |
| |\ \ \ \ | | |/ / / | |/| | | | ||||||
| | * | | | SI-7190 macros no longer give rise to bridges | Eugene Burmako | 2013-02-27 | 1 | -0/+26 | |
| | | | | | ||||||
| \ \ \ \ | ||||||
| \ \ \ \ | ||||||
| \ \ \ \ | ||||||
*---. \ \ \ \ | Merge 2.10.x into master. | Adriaan Moors | 2013-03-05 | 1 | -0/+11 | |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | / / / | | | |/ / / | | |/| / / | | | |/ / | ||||||
| | | * | | Merge pull request #2167 from retronym/ticket/7126 | Adriaan Moors | 2013-03-01 | 1 | -0/+11 | |
| | | |\ \ | ||||||
| | | | * | | SI-7126 Account for the alias types that don't dealias. | Jason Zaugg | 2013-02-25 | 1 | -0/+11 | |
| | | | |/ | ||||||
* | | | | | Merge branch 2.10.1 into master | Adriaan Moors | 2013-02-27 | 1 | -0/+13 | |
|\| | | | | ||||||
| * | | | | Merge 2.10.1 into 2.10.x. | Adriaan Moors | 2013-02-27 | 1 | -0/+13 | |
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / | ||||||
| | * / | SI-7180 Fix regression in implicit scope of HK type alias. | Jason Zaugg | 2013-02-25 | 1 | -0/+13 | |
| | |/ | ||||||
| | * | Additional test case for Lukas' fix to annotated originals. | Jason Zaugg | 2013-02-21 | 2 | -0/+14 | |
* | | | Merge 2.10.x into master. | Adriaan Moors | 2013-02-20 | 5 | -0/+49 | |
|\| | | ||||||
| * | | Merge pull request #2118 from lrytz/annotatedRetyping | James Iry | 2013-02-19 | 2 | -0/+14 | |
| |\ \ | ||||||
| | * | | Additional test case for Lukas' fix to annotated originals. | Jason Zaugg | 2013-02-18 | 2 | -0/+14 |