summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | Merge pull request #2257 from JamesIry/2.10.x_classfile_51Paul Phillips2013-03-259-3/+185
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Log when invokedynamic instruction is encounteredJames Iry2013-03-251-0/+1
| | * | | | | | | | | Read version 51 (JDK 7) class files.James Iry2013-03-149-3/+184
| | | |_|/ / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge pull request #2278 from kzys/jira-6580Paul Phillips2013-03-253-7/+54
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | SI-6580 Scaladoc: Should not close void elementsKato Kazuyoshi2013-03-253-7/+54
| | | |_|/ / / / / / | | |/| | | | | | |
| * | | | | | | | | 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-234-2363/+1321
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge scala/2.10.x into build-cleanup-2.10Adriaan Moors2013-03-2365-133/+622
| | |\| | | | | | |
| * | | | | | | | | 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-234-127/+135
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge pull request #2264 from Blaisorblade/issue/7253Paul Phillips2013-03-227-18/+70
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | |
| | * | | | | | | | | 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-167-2/+56
| | | |_|_|/ / / / / | | |/| | | | | | |
| * | | | | | | | | Merge pull request #2274 from vigdorchik/ticket/si-5699James Iry2013-03-223-7/+36
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | SI-5699 correct java parser for annotation defs.Eugene Vigdorchik2013-03-193-7/+36
| | |/ / / / / / / /
| * | | | | | | | | 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-223-5/+124
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | SI-7242 Fix crash when inner object mixes in its companionJason Zaugg2013-03-133-5/+124
| * | | | | | | | | | 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 #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-207-1/+33
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | SI-7259 Fix detection of Java defined SelectsJason Zaugg2013-03-167-1/+33
| | |/ / / / / / / / /
| * | | | | | | | | | Merge pull request #2271 from retronym/topic/mima-refactorAdriaan Moors2013-03-181-91/+44
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Reduce duplication and increase verbosity in MiMa execution.Jason Zaugg2013-03-161-91/+44
| | |/ / / / / / / /
| * | | | | | | | | Merge pull request #2255 from retronym/ticket/7249Adriaan Moors2013-03-173-1/+13
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | SI-7249 Reign in overzealous Function0 optimization.Jason Zaugg2013-03-133-1/+13
| | |/ / / / / / / /
| * | | | | | | | | Merge pull request #2253 from retronym/ticket/7239Adriaan Moors2013-03-174-4/+52
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | SI-6921 SI-7239 Tread lightly during exploratory typingJason Zaugg2013-03-134-4/+52
| | |/ / / / / / / /
| * | | | | | | | | Merge pull request #2247 from retronym/ticket/7232-2Adriaan Moors2013-03-1717-2/+96
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | SI-7232 Fix Java import vs defn. binding precendenceJason Zaugg2013-03-1317-2/+96
* | | | | | | | | | Merge pull request #2317 from retronym/ticket/7232-masterAdriaan Moors2013-04-0117-2/+96
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | SI-7232 Fix Java import vs defn. binding precendenceJason Zaugg2013-03-2617-2/+96
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge pull request #2318 from retronym/ticket/7259-masterAdriaan Moors2013-04-017-2/+34
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | SI-7259 Fix detection of Java defined SelectsJason Zaugg2013-03-267-2/+34
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #2305 from retronym/ticket/7296-2Adriaan Moors2013-03-299-65/+111
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | SI-7296 Remove arity limit for case classesJason Zaugg2013-03-2510-68/+102
| * | | | | | | | | SI-7296 Avoid crash with nested 23-param case classJason Zaugg2013-03-253-1/+13
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge pull request #2316 from vigdorchik/interactive_test_frameworkPaul Phillips2013-03-294-16/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Improve testing interactive experience.Eugene Vigdorchik2013-03-264-16/+7
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #2333 from paulp/pr/merge-395e90a786Paul Phillips2013-03-2918-120/+228
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge commit '395e90a786' into pr/merge-395e90a786Paul Phillips2013-03-2818-119/+227
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |
| | * | | | | | | | SI-7251, compiler crash with $.Paul Phillips2013-03-164-127/+135
| | | |_|/ / / / / | | |/| | | | | |