Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2327 from paulp/pr/2315-rebased | Paul Phillips | 2013-04-02 | 62 | -182/+182 |
|\ | |||||
| * | SI-7261 Implicit conversion of BooleanSetting to Boolean and BooleanFlag | Som Snytt | 2013-03-27 | 62 | -182/+182 |
* | | Merge pull request #2310 from retronym/ticket/6168 | Paul Phillips | 2013-04-02 | 1 | -1/+7 |
|\ \ | |||||
| * | | SI-6168 Retain prefix when parsing types in JVM signatures | Jason Zaugg | 2013-03-25 | 1 | -1/+7 |
* | | | Merge remote tracking branch 'origin/2.10.x' into topic/merge-2.10.x-to-v2.11... | Jason Zaugg | 2013-04-02 | 15 | -92/+144 |
|\ \ \ | |||||
| * \ \ | Merge pull request #2321 from kzys/js-defer | Adriaan Moors | 2013-04-01 | 2 | -16/+30 |
| |\ \ \ | |||||
| | * | | | Scaladoc: Load scripts at the bottom, and with a defer attribute | Kato Kazuyoshi | 2013-03-27 | 2 | -16/+30 |
| * | | | | Merge pull request #2292 from retronym/ticket/7285 | Adriaan Moors | 2013-03-27 | 1 | -1/+2 |
| |\ \ \ \ | |||||
| | * | | | | SI-7285 Fix match analysis with nested objects. | Jason Zaugg | 2013-03-23 | 1 | -1/+2 |
| * | | | | | Merge pull request #2291 from retronym/ticket/7290 | Adriaan Moors | 2013-03-27 | 1 | -5/+15 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| | * | | | | SI-7290 Minor cleanups driven by review comments. | Jason Zaugg | 2013-03-27 | 1 | -4/+4 |
| | * | | | | SI-7290 Discard duplicates in switchable alternative patterns. | Jason Zaugg | 2013-03-23 | 1 | -3/+13 |
| | |/ / / | |||||
| * | | | | Merge pull request #2270 from retronym/ticket/7246-2 | Paul Phillips | 2013-03-25 | 1 | -14/+12 |
| |\ \ \ \ | |||||
| | * | | | | SI-7246 Make $outer pointer elision Java aware | Jason Zaugg | 2013-03-23 | 1 | -14/+12 |
| * | | | | | Merge pull request #2306 from retronym/ticket/7299 | Paul Phillips | 2013-03-25 | 1 | -2/+8 |
| |\ \ \ \ \ | |||||
| | * | | | | | SI-7299 Improve error message for eta-expanding 23+ param method | Jason Zaugg | 2013-03-25 | 1 | -2/+8 |
| * | | | | | | Merge pull request #2257 from JamesIry/2.10.x_classfile_51 | Paul Phillips | 2013-03-25 | 5 | -2/+35 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Log when invokedynamic instruction is encountered | James Iry | 2013-03-25 | 1 | -0/+1 |
| | * | | | | | | Read version 51 (JDK 7) class files. | James Iry | 2013-03-14 | 5 | -2/+34 |
| | | |/ / / / | | |/| | | | | |||||
| * | | | | | | SI-6580 Scaladoc: Should not close void elements | Kato Kazuyoshi | 2013-03-25 | 1 | -7/+11 |
| | |/ / / / | |/| | | | | |||||
| * | | | | | Merge pull request #2279 from kzys/jira-7013 | Paul Phillips | 2013-03-23 | 1 | -3/+3 |
| |\ \ \ \ \ | |||||
| | * | | | | | SI-7013 Scaladoc: Fix StackOverflowError | Kato Kazuyoshi | 2013-03-20 | 1 | -3/+3 |
| * | | | | | | Merge pull request #2266 from paulp/issue/7251 | Paul Phillips | 2013-03-23 | 1 | -127/+114 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge pull request #2264 from Blaisorblade/issue/7253 | Paul Phillips | 2013-03-22 | 2 | -18/+18 |
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||||
| | * | | | | | | SI-7253: update comments and naming | Paolo G. Giarrusso | 2013-03-16 | 2 | -14/+14 |
| | * | | | | | | Remove fragile code, made redundant by previous commit | Paolo G. Giarrusso | 2013-03-16 | 2 | -4/+2 |
| | * | | | | | | SI-7253: respect binary compatibility constraints | Paolo G. Giarrusso | 2013-03-16 | 2 | -2/+4 |
| | | |_|/ / / | | |/| | | | | |||||
| * | | | | | | Merge pull request #2274 from vigdorchik/ticket/si-5699 | James Iry | 2013-03-22 | 1 | -7/+1 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | SI-5699 correct java parser for annotation defs. | Eugene Vigdorchik | 2013-03-19 | 1 | -7/+1 |
| | |/ / / / / | |||||
| * | | | | | | Merge pull request #2268 from scalamacros/topic/shannon-entropy | Paul Phillips | 2013-03-22 | 1 | -43/+22 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | removes duplication in FreeDef extractors | Eugene Burmako | 2013-03-16 | 1 | -43/+22 |
| | |/ / / / / | |||||
| * | | | | | | Merge pull request #2245 from retronym/ticket/7242 | Paul Phillips | 2013-03-22 | 1 | -5/+33 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | SI-7242 Fix crash when inner object mixes in its companion | Jason Zaugg | 2013-03-13 | 1 | -5/+33 |
| * | | | | | | | Merge pull request #2276 from scalamacros/topic/macro-trace | James Iry | 2013-03-20 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | an amazing discovery made by Iulian | Eugene Burmako | 2013-03-18 | 1 | -1/+1 |
| | | |/ / / / / | | |/| | | | | | |||||
| * | | | | | | | Merge pull request #2269 from retronym/ticket/7259 | James Iry | 2013-03-20 | 1 | -1/+3 |
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||||
| | * | | | | | | SI-7259 Fix detection of Java defined Selects | Jason Zaugg | 2013-03-16 | 1 | -1/+3 |
| | |/ / / / / | |||||
| * | | | | | | Merge pull request #2255 from retronym/ticket/7249 | Adriaan Moors | 2013-03-17 | 1 | -1/+5 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | SI-7249 Reign in overzealous Function0 optimization. | Jason Zaugg | 2013-03-13 | 1 | -1/+5 |
| | |/ / / / / | |||||
| * | | | | | | Merge pull request #2253 from retronym/ticket/7239 | Adriaan Moors | 2013-03-17 | 2 | -4/+3 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | SI-6921 SI-7239 Tread lightly during exploratory typing | Jason Zaugg | 2013-03-13 | 2 | -4/+3 |
| | |/ / / / / | |||||
| * | | | | | | Merge pull request #2247 from retronym/ticket/7232-2 | Adriaan Moors | 2013-03-17 | 2 | -2/+26 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | SI-7232 Fix Java import vs defn. binding precendence | Jason Zaugg | 2013-03-13 | 2 | -2/+26 |
* | | | | | | | Merge pull request #2317 from retronym/ticket/7232-master | Adriaan Moors | 2013-04-01 | 2 | -2/+26 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | SI-7232 Fix Java import vs defn. binding precendence | Jason Zaugg | 2013-03-26 | 2 | -2/+26 |
* | | | | | | | | Merge pull request #2318 from retronym/ticket/7259-master | Adriaan Moors | 2013-04-01 | 1 | -2/+4 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | SI-7259 Fix detection of Java defined Selects | Jason Zaugg | 2013-03-26 | 1 | -2/+4 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge pull request #2305 from retronym/ticket/7296-2 | Adriaan Moors | 2013-03-29 | 4 | -61/+70 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | SI-7296 Remove arity limit for case classes | Jason Zaugg | 2013-03-25 | 4 | -60/+67 |
| * | | | | | | | | SI-7296 Avoid crash with nested 23-param case class | Jason Zaugg | 2013-03-25 | 1 | -1/+3 |
| | |_|_|_|_|/ / | |/| | | | | | |