Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | SI-6580 Scaladoc: Should not close void elements | Kato Kazuyoshi | 2013-03-25 | 1 | -7/+11 |
* | Merge pull request #2295 from adriaanm/build-cleanup-2.10 | Paul Phillips | 2013-03-23 | 1 | -9/+9 |
|\ | |||||
| * | Merge scala/2.10.x into build-cleanup-2.10 | Adriaan Moors | 2013-03-23 | 17 | -92/+126 |
| |\ | |||||
| * | | Sanity for build.xml: exscriptus&positus delendus est. | Adriaan Moors | 2013-03-23 | 1 | -9/+9 |
* | | | 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 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | SI-7251, compiler crash with $. | Paul Phillips | 2013-03-16 | 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 #2283 from scalamacros/topic/silence-the-log | James Iry | 2013-03-20 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | fixes the craziness in JavaUniverse.log | Eugene Burmako | 2013-03-20 | 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 #2234 from scalamacros/ticket/7240 | Paul Phillips | 2013-03-12 | 2 | -2/+2 |
|\ \ \ | |||||
| * | | | SI-7240 fixes language feature lookup | Eugene Burmako | 2013-03-12 | 2 | -2/+2 |
* | | | | Merge pull request #2230 from retronym/ticket/7233 | Paul Phillips | 2013-03-12 | 2 | -1/+2 |
|\ \ \ \ | |||||
| * | | | | SI-7233 Account for aliased imports in Erasure | Jason Zaugg | 2013-03-10 | 1 | -1/+1 |
| * | | | | SI-7233 Account for aliased imports in eta expansion. | Jason Zaugg | 2013-03-10 | 1 | -0/+1 |
* | | | | | Merge pull request #2222 from scalamacros/ticket/6725 | Paul Phillips | 2013-03-12 | 1 | -1/+2 |
|\ \ \ \ \ | |||||
| * | | | | | SI-6725 `f` interpolator now supports %n tokens | Eugene Burmako | 2013-03-09 | 1 | -1/+2 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #2227 from mergeconflict/2.10.x-SI-7132 | Paul Phillips | 2013-03-12 | 1 | -5/+7 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | SI-7132 - don't discard Unit type in interpreter | Dan Rosen | 2013-03-09 | 1 | -5/+7 |
* | | | | | Merge pull request #2224 from retronym/ticket/7238 | Adriaan Moors | 2013-03-11 | 1 | -3/+3 |
|\ \ \ \ \ | |||||
| * | | | | | SI-7328 Bail out of names/defaults if args are error typed | Jason Zaugg | 2013-03-09 | 1 | -3/+3 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #2225 from retronym/ticket/7234 | Adriaan Moors | 2013-03-11 | 1 | -7/+10 |
|\ \ \ \ \ | |||||
| * | | | | | SI-7234 Make named args play nice with dep. method types | Jason Zaugg | 2013-03-09 | 1 | -7/+10 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #2223 from scalamacros/ticket/7235 | Adriaan Moors | 2013-03-11 | 2 | -0/+6 |
|\ \ \ \ \ | |||||
| * | | | | | reifier is now aware of SI-7235 | Eugene Burmako | 2013-03-09 | 2 | -0/+6 |
| | |_|_|/ | |/| | | | |||||
* | | | | | SI-7226 Fix inference regression caused by TypeVar equality. | Jason Zaugg | 2013-03-09 | 1 | -0/+6 |
| |_|/ / |/| | | | |||||
* | | | | Fix SI-7224. | Iulian Dragos | 2013-03-07 | 1 | -1/+1 |
| |/ / |/| | | |||||
* | | | Merge pull request #2199 from retronym/ticket/7214 | Adriaan Moors | 2013-03-05 | 1 | -1/+3 |
|\ \ \ | |||||
| * | | | SI-7214 outer check based on dealiased pattern type. | Jason Zaugg | 2013-03-05 | 1 | -1/+3 |
* | | | | Merge pull request #2156 from vigdorchik/hierarchy | Adriaan Moors | 2013-03-05 | 5 | -61/+65 |
|\ \ \ \ |