Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2317 from retronym/ticket/7232-master | Adriaan Moors | 2013-04-01 | 17 | -2/+96 |
|\ | |||||
| * | SI-7232 Fix Java import vs defn. binding precendence | Jason Zaugg | 2013-03-26 | 17 | -2/+96 |
* | | Merge pull request #2318 from retronym/ticket/7259-master | Adriaan Moors | 2013-04-01 | 7 | -2/+34 |
|\ \ | |||||
| * | | SI-7259 Fix detection of Java defined Selects | Jason Zaugg | 2013-03-26 | 7 | -2/+34 |
| |/ | |||||
* | | Merge pull request #2305 from retronym/ticket/7296-2 | Adriaan Moors | 2013-03-29 | 9 | -65/+111 |
|\ \ | |||||
| * | | SI-7296 Remove arity limit for case classes | Jason Zaugg | 2013-03-25 | 10 | -68/+102 |
| * | | SI-7296 Avoid crash with nested 23-param case class | Jason Zaugg | 2013-03-25 | 3 | -1/+13 |
* | | | Merge pull request #2316 from vigdorchik/interactive_test_framework | Paul Phillips | 2013-03-29 | 4 | -16/+7 |
|\ \ \ | |||||
| * | | | Improve testing interactive experience. | Eugene Vigdorchik | 2013-03-26 | 4 | -16/+7 |
| | |/ | |/| | |||||
* | | | Merge pull request #2333 from paulp/pr/merge-395e90a786 | Paul Phillips | 2013-03-29 | 18 | -120/+228 |
|\ \ \ | |||||
| * \ \ | Merge commit '395e90a786' into pr/merge-395e90a786 | Paul Phillips | 2013-03-28 | 18 | -119/+227 |
| |\ \ \ | |||||
| | * | | | SI-7251, compiler crash with $. | Paul Phillips | 2013-03-16 | 4 | -127/+135 |
| | * | | | Merge pull request #2234 from scalamacros/ticket/7240 | Paul Phillips | 2013-03-12 | 5 | -2/+53 |
| | |\ \ \ | |||||
| | | * | | | SI-7240 fixes language feature lookup | Eugene Burmako | 2013-03-12 | 5 | -2/+53 |
| | * | | | | Merge pull request #2230 from retronym/ticket/7233 | Paul Phillips | 2013-03-12 | 4 | -1/+24 |
| | |\ \ \ \ | |||||
| | | * | | | | SI-7233 Account for aliased imports in Erasure | Jason Zaugg | 2013-03-10 | 2 | -1/+9 |
| | | * | | | | SI-7233 Account for aliased imports in eta expansion. | Jason Zaugg | 2013-03-10 | 2 | -0/+15 |
| | * | | | | | Merge pull request #2222 from scalamacros/ticket/6725 | Paul Phillips | 2013-03-12 | 5 | -1/+23 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | SI-6725 `f` interpolator now supports %n tokens | Eugene Burmako | 2013-03-09 | 5 | -1/+23 |
| | | | |/ / / | | | |/| | | | |||||
| | * | | | | | Merge pull request #2227 from mergeconflict/2.10.x-SI-7132 | Paul Phillips | 2013-03-12 | 3 | -15/+22 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | SI-7132 - don't discard Unit type in interpreter | Dan Rosen | 2013-03-09 | 3 | -15/+22 |
| * | | | | | | | Merge commit 'refs/pull/2326/head' into pr/merge-395e90a786 | Paul Phillips | 2013-03-28 | 1 | -1/+1 |
|/| | | | | | | | |||||
| * | | | | | | | SI-7302 importing from Any. | Paul Phillips | 2013-03-27 | 1 | -1/+1 |
* | | | | | | | | Merge pull request #2323 from paulp/pr/iterator_++ | Paul Phillips | 2013-03-28 | 3 | -18/+55 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Iterator.++ no longer blows the stack. | Paul Phillips | 2013-03-26 | 3 | -18/+55 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge pull request #2325 from retronym/ticket/7186-2 | Paul Phillips | 2013-03-27 | 1 | -6/+14 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | SI-7186 Slim down some TypeRefs by 8 bytes. | Jason Zaugg | 2013-03-27 | 1 | -6/+14 |
* | | | | | | | | Merge pull request #2289 from paulp/pr/name-logic | Paul Phillips | 2013-03-27 | 24 | -200/+216 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Overhauled local/getter/setter name logic. | Paul Phillips | 2013-03-25 | 24 | -200/+216 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge pull request #2311 from retronym/topic/repl-intellij | Adriaan Moors | 2013-03-27 | 2 | -0/+26 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | An IntelliJ Module for the recently modularized REPL. | Jason Zaugg | 2013-03-25 | 2 | -0/+26 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #2290 from adriaanm/build-cleanup-squashed | Adriaan Moors | 2013-03-25 | 3 | -2157/+1262 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Merge master. | Adriaan Moors | 2013-03-25 | 158 | -1066/+2185 |
| |\| | | | | | |||||
| * | | | | | | Merge 2.10.x into master | Adriaan Moors | 2013-03-25 | 4 | -2150/+1265 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Allow getting STARR via maven, also: locker.skip | Adriaan Moors | 2013-03-23 | 1 | -5/+35 |
| | * | | | | | | Use stage/project for taskname instead of scalacfork | Adriaan Moors | 2013-03-23 | 1 | -2/+2 |
| | * | | | | | | Sanity for build.xml: exscriptus&positus delendus est. | Adriaan Moors | 2013-03-23 | 4 | -2440/+1300 |
| | | |/ / / / | | |/| | | | | |||||
* | | | | | | | Merge pull request #2299 from retronym/ticket/7294 | Paul Phillips | 2013-03-25 | 34 | -8/+60 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | Cleanup obsolete options in CodeGen. | Jason Zaugg | 2013-03-24 | 2 | -5/+1 |
| * | | | | | | SI-7294 Deprecate inheritance from TupleN. | Jason Zaugg | 2013-03-24 | 27 | -1/+32 |
| * | | | | | | SI-7294 Treat TupleN as final under -Xfuture | Jason Zaugg | 2013-03-24 | 5 | -2/+27 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #2285 from vigdorchik/silence_scaladoc | Paul Phillips | 2013-03-23 | 62 | -527/+511 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Doc -> C-style comments for local symbols to avoid "discarding | Eugene Vigdorchik | 2013-03-21 | 62 | -528/+512 |
* | | | | | | | Merge pull request #2265 from rjolly/scripting9 | Paul Phillips | 2013-03-23 | 5 | -9/+79 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | The script engine is given a better binding mechanism and reflexive access | Raphael Jolly | 2013-03-22 | 3 | -4/+68 |
| * | | | | | | | Bypass determination of protection domain when resource is not in a jar | Raphael Jolly | 2013-03-22 | 2 | -5/+11 |
* | | | | | | | | Merge pull request #2260 from som-snytt/issue/5717-assert-pkgdir | Paul Phillips | 2013-03-23 | 3 | -28/+54 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | SI-5717 error when bytecode cannot be written | Som Snytt | 2013-03-22 | 3 | -28/+54 |
* | | | | | | | | | Merge pull request #2259 from Blaisorblade/issue/6123-try-3 | Paul Phillips | 2013-03-22 | 9 | -6/+53 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Add positive and negative testcases for SI-6123 (-explaintypes) | Paolo G. Giarrusso | 2013-03-15 | 7 | -0/+45 |