summaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Use java-diff-utils for diffing in partest.Adriaan Moors2013-03-296-1503/+26
* Merge pull request #2292 from retronym/ticket/7285Adriaan Moors2013-03-272-4/+6
|\
| * SI-7285 Fix match analysis with nested objects.Jason Zaugg2013-03-232-4/+6
* | Merge pull request #2291 from retronym/ticket/7290Adriaan Moors2013-03-271-5/+15
|\ \
| * | SI-7290 Minor cleanups driven by review comments.Jason Zaugg2013-03-271-4/+4
| * | SI-7290 Discard duplicates in switchable alternative patterns.Jason Zaugg2013-03-231-3/+13
| |/
* | Merge pull request #2288 from paulp/pr/2273-with-editsPaul Phillips2013-03-271-11/+24
|\ \
| * | SI-6387 Clones accessor before name expansionEugene Vigdorchik2013-03-251-11/+24
* | | Merge pull request #2252 from soc/SI-7237-2.10Paul Phillips2013-03-251-5/+2
|\ \ \
| * | | [backport] SI-7237 Always choose ForkJoinTaskSupportSimon Ochsenreither2013-03-151-5/+2
| |/ /
* | | Merge pull request #2270 from retronym/ticket/7246-2Paul Phillips2013-03-251-14/+12
|\ \ \
| * | | SI-7246 Make $outer pointer elision Java awareJason Zaugg2013-03-231-14/+12
| |/ /
* | | Merge pull request #2306 from retronym/ticket/7299Paul Phillips2013-03-251-2/+8
|\ \ \
| * | | SI-7299 Improve error message for eta-expanding 23+ param methodJason Zaugg2013-03-251-2/+8
* | | | Merge pull request #2257 from JamesIry/2.10.x_classfile_51Paul Phillips2013-03-256-3/+39
|\ \ \ \
| * | | | Log when invokedynamic instruction is encounteredJames Iry2013-03-251-0/+1
| * | | | Read version 51 (JDK 7) class files.James Iry2013-03-146-3/+38
| | |/ / | |/| |
* | | | SI-6580 Scaladoc: Should not close void elementsKato Kazuyoshi2013-03-251-7/+11
| |/ / |/| |
* | | Merge pull request #2295 from adriaanm/build-cleanup-2.10Paul Phillips2013-03-231-9/+9
|\ \ \
| * \ \ Merge scala/2.10.x into build-cleanup-2.10Adriaan Moors2013-03-2317-92/+126
| |\ \ \
| * | | | Sanity for build.xml: exscriptus&positus delendus est.Adriaan Moors2013-03-231-9/+9
* | | | | Merge pull request #2279 from kzys/jira-7013Paul Phillips2013-03-231-3/+3
|\ \ \ \ \
| * | | | | SI-7013 Scaladoc: Fix StackOverflowErrorKato Kazuyoshi2013-03-201-3/+3
* | | | | | Merge pull request #2266 from paulp/issue/7251Paul Phillips2013-03-231-127/+114
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | SI-7251, compiler crash with $.Paul Phillips2013-03-161-127/+114
| | |_|/ / | |/| | |
* | | | | Merge pull request #2264 from Blaisorblade/issue/7253Paul Phillips2013-03-222-18/+18
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | SI-7253: update comments and namingPaolo G. Giarrusso2013-03-162-14/+14
| * | | | Remove fragile code, made redundant by previous commitPaolo G. Giarrusso2013-03-162-4/+2
| * | | | SI-7253: respect binary compatibility constraintsPaolo G. Giarrusso2013-03-162-2/+4
| |/ / /
* | | | Merge pull request #2274 from vigdorchik/ticket/si-5699James Iry2013-03-221-7/+1
|\ \ \ \
| * | | | SI-5699 correct java parser for annotation defs.Eugene Vigdorchik2013-03-191-7/+1
| |/ / /
* | | | Merge pull request #2268 from scalamacros/topic/shannon-entropyPaul Phillips2013-03-221-43/+22
|\ \ \ \
| * | | | removes duplication in FreeDef extractorsEugene Burmako2013-03-161-43/+22
| |/ / /
* | | | Merge pull request #2245 from retronym/ticket/7242Paul Phillips2013-03-221-5/+33
|\ \ \ \
| * | | | SI-7242 Fix crash when inner object mixes in its companionJason Zaugg2013-03-131-5/+33
| | |_|/ | |/| |
* | | | Merge pull request #2276 from scalamacros/topic/macro-traceJames Iry2013-03-201-1/+1
|\ \ \ \
| * | | | an amazing discovery made by IulianEugene Burmako2013-03-181-1/+1
| | |/ / | |/| |
* | | | Merge pull request #2283 from scalamacros/topic/silence-the-logJames Iry2013-03-201-1/+1
|\ \ \ \
| * | | | fixes the craziness in JavaUniverse.logEugene Burmako2013-03-201-1/+1
| | |_|/ | |/| |
* | | | Merge pull request #2269 from retronym/ticket/7259James Iry2013-03-201-1/+3
|\ \ \ \ | |/ / / |/| | |
| * | | SI-7259 Fix detection of Java defined SelectsJason Zaugg2013-03-161-1/+3
| |/ /
* | | Merge pull request #2255 from retronym/ticket/7249Adriaan Moors2013-03-171-1/+5
|\ \ \
| * | | SI-7249 Reign in overzealous Function0 optimization.Jason Zaugg2013-03-131-1/+5
| |/ /
* | | Merge pull request #2253 from retronym/ticket/7239Adriaan Moors2013-03-172-4/+3
|\ \ \
| * | | SI-6921 SI-7239 Tread lightly during exploratory typingJason Zaugg2013-03-132-4/+3
| |/ /
* | | Merge pull request #2247 from retronym/ticket/7232-2Adriaan Moors2013-03-172-2/+26
|\ \ \ | |/ / |/| |
| * | SI-7232 Fix Java import vs defn. binding precendenceJason Zaugg2013-03-132-2/+26
* | | Merge pull request #2234 from scalamacros/ticket/7240Paul Phillips2013-03-122-2/+2
|\ \ \
| * | | SI-7240 fixes language feature lookupEugene Burmako2013-03-122-2/+2
* | | | Merge pull request #2230 from retronym/ticket/7233Paul Phillips2013-03-122-1/+2
|\ \ \ \