summaryrefslogtreecommitdiff
path: root/test
Commit message (Expand)AuthorAgeFilesLines
* Merge remote tracking branch 'origin/2.10.x' into topic/merge-2.10.x-to-v2.11...Jason Zaugg2013-04-0245-507/+1318
|\
| * Merge pull request #2321 from kzys/js-deferAdriaan Moors2013-04-011-7/+0
| |\
| | * Scaladoc: Load scripts at the bottom, and with a defer attributeKato Kazuyoshi2013-03-271-7/+0
| * | Strip version suffix from diffutils.Adriaan Moors2013-03-291-1/+1
| * | Use java-diff-utils for diffing in partest.Adriaan Moors2013-03-293-492/+573
| * | Merge pull request #2292 from retronym/ticket/7285Adriaan Moors2013-03-277-3/+164
| |\ \
| | * | SI-7285 Fix match analysis with nested objects.Jason Zaugg2013-03-236-4/+154
| | * | Expand test for SI-6124 to demonstrate cause of SI-7285.Jason Zaugg2013-03-232-3/+14
| * | | Merge pull request #2291 from retronym/ticket/7290Adriaan Moors2013-03-274-0/+30
| |\ \ \
| | * | | SI-7290 Minor cleanups driven by review comments.Jason Zaugg2013-03-271-1/+1
| | * | | SI-7290 Discard duplicates in switchable alternative patterns.Jason Zaugg2013-03-234-0/+30
| | |/ /
| * | | Merge pull request #2288 from paulp/pr/2273-with-editsPaul Phillips2013-03-272-0/+17
| |\ \ \ | | |_|/ | |/| |
| | * | SI-6387 Clones accessor before name expansionEugene Vigdorchik2013-03-252-0/+17
| * | | Merge pull request #2270 from retronym/ticket/7246-2Paul Phillips2013-03-258-8/+87
| |\ \ \
| | * | | SI-7246 Make $outer pointer elision Java awareJason Zaugg2013-03-238-8/+87
| | |/ /
| * | | Merge pull request #2306 from retronym/ticket/7299Paul Phillips2013-03-252-0/+13
| |\ \ \
| | * | | SI-7299 Improve error message for eta-expanding 23+ param methodJason Zaugg2013-03-252-0/+13
| * | | | Merge pull request #2257 from JamesIry/2.10.x_classfile_51Paul Phillips2013-03-251-0/+126
| |\ \ \ \
| | * | | | Read version 51 (JDK 7) class files.James Iry2013-03-141-0/+126
| | | |/ / | | |/| |
| * | | | Merge pull request #2278 from kzys/jira-6580Paul Phillips2013-03-252-0/+43
| |\ \ \ \
| | * | | | SI-6580 Scaladoc: Should not close void elementsKato Kazuyoshi2013-03-252-0/+43
| | | |/ / | | |/| |
| * | | | Merge pull request #2293 from retronym/ticket/6210Adriaan Moors2013-03-252-0/+22
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | SI-6210 Test case for already-fixed pattern matcher bugJason Zaugg2013-03-232-0/+22
| * | | | Merge pull request #2295 from adriaanm/build-cleanup-2.10Paul Phillips2013-03-231-0/+0
| |\ \ \ \
| | * | | | Merge scala/2.10.x into build-cleanup-2.10Adriaan Moors2013-03-2347-13/+447
| | |\| | |
| * | | | | Merge pull request #2266 from paulp/issue/7251Paul Phillips2013-03-233-0/+21
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge pull request #2264 from Blaisorblade/issue/7253Paul Phillips2013-03-225-0/+52
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | SI-7253: respect binary compatibility constraintsPaolo G. Giarrusso2013-03-165-0/+52
| | | |_|/ | | |/| |
| * | | | Merge pull request #2274 from vigdorchik/ticket/si-5699James Iry2013-03-222-0/+35
| |\ \ \ \
| | * | | | SI-5699 correct java parser for annotation defs.Eugene Vigdorchik2013-03-192-0/+35
| | |/ / /
| * | | | Merge pull request #2245 from retronym/ticket/7242Paul Phillips2013-03-222-0/+91
| |\ \ \ \
| | * | | | SI-7242 Fix crash when inner object mixes in its companionJason Zaugg2013-03-132-0/+91
| * | | | | Merge pull request #2261 from soc/SI-7258James Iry2013-03-202-3/+3
| |\ \ \ \ \
| | * | | | | SI-7258 Don't assume order of reflection values in t6223Simon Ochsenreither2013-03-152-3/+3
| | | |/ / / | | |/| | |
| * | | | | Merge pull request #2269 from retronym/ticket/7259James Iry2013-03-206-0/+30
| |\ \ \ \ \
| | * | | | | SI-7259 Fix detection of Java defined SelectsJason Zaugg2013-03-166-0/+30
| | |/ / / /
| * | | | | Merge pull request #2255 from retronym/ticket/7249Adriaan Moors2013-03-172-0/+8
| |\ \ \ \ \
| | * | | | | SI-7249 Reign in overzealous Function0 optimization.Jason Zaugg2013-03-132-0/+8
| | |/ / / /
| * | | | | Merge pull request #2253 from retronym/ticket/7239Adriaan Moors2013-03-172-0/+49
| |\ \ \ \ \
| | * | | | | SI-6921 SI-7239 Tread lightly during exploratory typingJason Zaugg2013-03-132-0/+49
| | |/ / / /
| * | | | | Merge pull request #2247 from retronym/ticket/7232-2Adriaan Moors2013-03-1715-0/+70
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | SI-7232 Fix Java import vs defn. binding precendenceJason Zaugg2013-03-1315-0/+70
* | | | | | Merge pull request #2317 from retronym/ticket/7232-masterAdriaan Moors2013-04-0115-0/+70
|\ \ \ \ \ \
| * | | | | | SI-7232 Fix Java import vs defn. binding precendenceJason Zaugg2013-03-2615-0/+70
* | | | | | | Merge pull request #2318 from retronym/ticket/7259-masterAdriaan Moors2013-04-016-0/+30
|\ \ \ \ \ \ \
| * | | | | | | SI-7259 Fix detection of Java defined SelectsJason Zaugg2013-03-266-0/+30
| |/ / / / / /
* | | | | | | Merge pull request #2305 from retronym/ticket/7296-2Adriaan Moors2013-03-295-4/+41
|\ \ \ \ \ \ \
| * | | | | | | SI-7296 Remove arity limit for case classesJason Zaugg2013-03-256-8/+35
| * | | | | | | SI-7296 Avoid crash with nested 23-param case classJason Zaugg2013-03-252-0/+10
* | | | | | | | Merge pull request #2316 from vigdorchik/interactive_test_frameworkPaul Phillips2013-03-292-4/+5
|\ \ \ \ \ \ \ \