Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | |/ | |/| | |||||
* | | | Merge pull request #2269 from retronym/ticket/7259 | James Iry | 2013-03-20 | 6 | -0/+30 |
|\ \ \ | |||||
| * | | | SI-7259 Fix detection of Java defined Selects | Jason Zaugg | 2013-03-16 | 6 | -0/+30 |
| |/ / | |||||
* | | | Merge pull request #2255 from retronym/ticket/7249 | Adriaan Moors | 2013-03-17 | 2 | -0/+8 |
|\ \ \ | |||||
| * | | | SI-7249 Reign in overzealous Function0 optimization. | Jason Zaugg | 2013-03-13 | 2 | -0/+8 |
| |/ / | |||||
* | | | 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 #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 #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 |
* | | | | | 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 #2224 from retronym/ticket/7238 | Adriaan Moors | 2013-03-11 | 2 | -0/+13 |
|\ \ \ \ \ | |||||
| * | | | | | SI-7328 Bail out of names/defaults if args are error typed | Jason Zaugg | 2013-03-09 | 2 | -0/+13 |
| | |_|_|/ | |/| | | | |||||
* | | | | | 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 |
| | |_|_|/ | |/| | | | |||||
* | | | | | 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 | 4 | -0/+36 |
|\ \ \ \ \ | |||||
| * | | | | | reifier is now aware of SI-7235 | Eugene Burmako | 2013-03-09 | 4 | -0/+36 |
| |/ / / / | |||||
* | | / / | SI-7226 Fix inference regression caused by TypeVar equality. | Jason Zaugg | 2013-03-09 | 1 | -0/+26 |
| |_|/ / |/| | | | |||||
* | | | | Fix SI-7224. | Iulian Dragos | 2013-03-07 | 2 | -1/+168 |
| |/ / |/| | | |||||
* | | | Merge pull request #2199 from retronym/ticket/7214 | Adriaan Moors | 2013-03-05 | 1 | -0/+57 |
|\ \ \ | |||||
| * | | | SI-7214 outer check based on dealiased pattern type. | Jason Zaugg | 2013-03-05 | 1 | -0/+57 |
* | | | | Merge pull request #2156 from vigdorchik/hierarchy | Adriaan Moors | 2013-03-05 | 6 | -84/+106 |
|\ \ \ \ | |||||
| * | | | | SI-7109 SI-7153 Generalize the API to get docComments: allow to force docTrees | Eugene Vigdorchik | 2013-02-24 | 6 | -84/+106 |
* | | | | | Merge pull request #2193 from adriaanm/patmat-refactor | Adriaan Moors | 2013-03-05 | 6 | -63/+25 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge 2.10.1 into 2.10.x | Adriaan Moors | 2013-03-03 | 4 | -63/+11 |
| |\ \ \ \ \ | |||||
| | * | | | | | [nomaster] SI-7195 minor version mustn't introduce warnings | Adriaan Moors | 2013-03-01 | 3 | -63/+0 |
| | * | | | | | 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 |
| | * | | | | | | 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 |
| | | |/ / / / / | |||||
| * | | | | / / | [port] SI-7183 Disable unreachability for withFilter matches. | Adriaan Moors | 2013-03-03 | 2 | -0/+14 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge pull request #2198 from retronym/ticket/7215 | Paul Phillips | 2013-03-05 | 1 | -0/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | SI-7215 Fix transpose of an empty Array[Array[T]]. | Jason Zaugg | 2013-03-05 | 1 | -0/+6 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge pull request #2175 from retronym/ticket/7185 | Paul Phillips | 2013-03-05 | 4 | -0/+56 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | SI-7185 Avoid NPE in TreeInfo.isExprSafeToInline | Jason Zaugg | 2013-03-02 | 4 | -0/+56 |
* | | | | | | | | Merge pull request #2178 from scalamacros/ticket/7190 | Paul Phillips | 2013-03-05 | 1 | -0/+26 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | |