Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2310 from retronym/ticket/6168 | Paul Phillips | 2013-04-02 | 9 | -0/+142 |
|\ | |||||
| * | SI-6168 Retain prefix when parsing types in JVM signatures | Jason Zaugg | 2013-03-25 | 9 | -0/+142 |
* | | Merge remote tracking branch 'origin/2.10.x' into topic/merge-2.10.x-to-v2.11... | Jason Zaugg | 2013-04-02 | 23 | -505/+959 |
|\ \ | |||||
| * | | Use java-diff-utils for diffing in partest. | Adriaan Moors | 2013-03-29 | 2 | -490/+571 |
| * | | Merge pull request #2292 from retronym/ticket/7285 | Adriaan Moors | 2013-03-27 | 2 | -3/+11 |
| |\ \ | |||||
| | * | | SI-7285 Fix match analysis with nested objects. | Jason Zaugg | 2013-03-23 | 1 | -4/+1 |
| | * | | Expand test for SI-6124 to demonstrate cause of SI-7285. | Jason Zaugg | 2013-03-23 | 2 | -3/+14 |
| * | | | Merge pull request #2291 from retronym/ticket/7290 | Adriaan Moors | 2013-03-27 | 1 | -0/+9 |
| |\ \ \ | |||||
| | * | | | SI-7290 Discard duplicates in switchable alternative patterns. | Jason Zaugg | 2013-03-23 | 1 | -0/+9 |
| | |/ / | |||||
| * | | | Merge pull request #2288 from paulp/pr/2273-with-edits | Paul Phillips | 2013-03-27 | 2 | -0/+17 |
| |\ \ \ | |||||
| | * | | | SI-6387 Clones accessor before name expansion | Eugene Vigdorchik | 2013-03-25 | 2 | -0/+17 |
| * | | | | Merge pull request #2270 from retronym/ticket/7246-2 | Paul Phillips | 2013-03-25 | 8 | -8/+87 |
| |\ \ \ \ | |||||
| | * | | | | SI-7246 Make $outer pointer elision Java aware | Jason Zaugg | 2013-03-23 | 8 | -8/+87 |
| | |/ / / | |||||
| * | | | | Merge pull request #2257 from JamesIry/2.10.x_classfile_51 | Paul Phillips | 2013-03-25 | 1 | -0/+126 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | Read version 51 (JDK 7) class files. | James Iry | 2013-03-14 | 1 | -0/+126 |
| | |/ / | |||||
| * | | | Merge pull request #2274 from vigdorchik/ticket/si-5699 | James Iry | 2013-03-22 | 2 | -0/+35 |
| |\ \ \ | |||||
| | * | | | SI-5699 correct java parser for annotation defs. | Eugene Vigdorchik | 2013-03-19 | 2 | -0/+35 |
| | |/ / | |||||
| * | | | Merge pull request #2245 from retronym/ticket/7242 | Paul Phillips | 2013-03-22 | 2 | -0/+91 |
| |\ \ \ | |||||
| | * | | | SI-7242 Fix crash when inner object mixes in its companion | Jason Zaugg | 2013-03-13 | 2 | -0/+91 |
| * | | | | Merge pull request #2261 from soc/SI-7258 | James Iry | 2013-03-20 | 2 | -3/+3 |
| |\ \ \ \ | |||||
| | * | | | | SI-7258 Don't assume order of reflection values in t6223 | Simon Ochsenreither | 2013-03-15 | 2 | -3/+3 |
| | | |/ / | | |/| | | |||||
| * / | | | SI-7249 Reign in overzealous Function0 optimization. | Jason Zaugg | 2013-03-13 | 2 | -0/+8 |
| |/ / / | |||||
* | | | | Merge pull request #2305 from retronym/ticket/7296-2 | Adriaan Moors | 2013-03-29 | 2 | -0/+35 |
|\ \ \ \ | |||||
| * | | | | SI-7296 Remove arity limit for case classes | Jason Zaugg | 2013-03-25 | 2 | -0/+35 |
| | |_|/ | |/| | | |||||
* | | | | Merge commit '395e90a786' into pr/merge-395e90a786 | Paul Phillips | 2013-03-28 | 7 | -0/+72 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge pull request #2234 from scalamacros/ticket/7240 | Paul Phillips | 2013-03-12 | 3 | -0/+51 |
| |\ \ \ | |||||
| | * | | | SI-7240 fixes language feature lookup | Eugene Burmako | 2013-03-12 | 3 | -0/+51 |
| * | | | | Merge pull request #2222 from scalamacros/ticket/6725 | Paul Phillips | 2013-03-12 | 4 | -0/+21 |
| |\ \ \ \ | |||||
| | * | | | | SI-6725 `f` interpolator now supports %n tokens | Eugene Burmako | 2013-03-09 | 4 | -0/+21 |
| | |/ / / | |||||
| * | | | | Merge pull request #2227 from mergeconflict/2.10.x-SI-7132 | Paul Phillips | 2013-03-12 | 2 | -10/+15 |
| |\ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | SI-7132 - don't discard Unit type in interpreter | Dan Rosen | 2013-03-09 | 2 | -10/+15 |
* | | | | | Merge pull request #2323 from paulp/pr/iterator_++ | Paul Phillips | 2013-03-28 | 2 | -0/+19 |
|\ \ \ \ \ | |||||
| * | | | | | Iterator.++ no longer blows the stack. | Paul Phillips | 2013-03-26 | 2 | -0/+19 |
| | |_|_|/ | |/| | | | |||||
* / | | | | Overhauled local/getter/setter name logic. | Paul Phillips | 2013-03-25 | 2 | -10/+10 |
|/ / / / | |||||
* | | | | Merge pull request #2260 from som-snytt/issue/5717-assert-pkgdir | Paul Phillips | 2013-03-23 | 1 | -0/+21 |
|\ \ \ \ | |||||
| * | | | | SI-5717 error when bytecode cannot be written | Som Snytt | 2013-03-22 | 1 | -0/+21 |
* | | | | | SI-7102 Specialize isEmpty for bitsets | Eugene Vigdorchik | 2013-03-21 | 1 | -0/+13 |
* | | | | | Merge pull request #2235 from vigdorchik/si_5513 | James Iry | 2013-03-20 | 2 | -0/+27 |
|\ \ \ \ \ | |||||
| * | | | | | SI-5513: add inplace set-theoretic operations for mutable bitsets. | Eugene Vigdorchik | 2013-03-11 | 2 | -0/+27 |
* | | | | | | Merge pull request #2244 from paulp/pr/notNull | Adriaan Moors | 2013-03-17 | 2 | -4/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | SI-7247, deprecated NotNull. | Paul Phillips | 2013-03-13 | 2 | -4/+4 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #2214 from JamesIry/master_constant_optimization | James Iry | 2013-03-15 | 7 | -3/+142 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Cleanup of constant optimization | James Iry | 2013-03-14 | 6 | -0/+118 |
| * | | | | | Analyze constants to remove unnecessary branches | James Iry | 2013-03-07 | 3 | -3/+24 |
* | | | | | | Merge pull request #2242 from adriaanm/merge-2.10.x | Paul Phillips | 2013-03-13 | 6 | -0/+50 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge 2.10.x into master | Adriaan Moors | 2013-03-12 | 6 | -0/+50 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| | * | | | | | Merge pull request #2221 from scalamacros/ticket/5710 | Adriaan Moors | 2013-03-11 | 4 | -0/+32 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | SI-5710 has fixed itself | Eugene Burmako | 2013-03-09 | 4 | -0/+32 |
| | | | |_|_|/ | | | |/| | | | |||||
| | * | | | | | Merge pull request #2223 from scalamacros/ticket/7235 | Adriaan Moors | 2013-03-11 | 2 | -0/+18 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | reifier is now aware of SI-7235 | Eugene Burmako | 2013-03-09 | 2 | -0/+18 |
| | | |/ / / / |