Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | Merge commit '395e90a786' into pr/merge-395e90a786 | Paul Phillips | 2013-03-28 | 6 | -119/+112 | |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | ||||||
| * | | | | | | | | SI-7251, compiler crash with $. | Paul Phillips | 2013-03-16 | 1 | -127/+114 | |
| | |_|/ / / / / | |/| | | | | | | ||||||
| * | | | | | | | Merge pull request #2234 from scalamacros/ticket/7240 | Paul Phillips | 2013-03-12 | 2 | -2/+2 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | SI-7240 fixes language feature lookup | Eugene Burmako | 2013-03-12 | 2 | -2/+2 | |
| * | | | | | | | | Merge pull request #2230 from retronym/ticket/7233 | Paul Phillips | 2013-03-12 | 2 | -1/+2 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | SI-7233 Account for aliased imports in Erasure | Jason Zaugg | 2013-03-10 | 1 | -1/+1 | |
| | * | | | | | | | | SI-7233 Account for aliased imports in eta expansion. | Jason Zaugg | 2013-03-10 | 1 | -0/+1 | |
| * | | | | | | | | | Merge pull request #2222 from scalamacros/ticket/6725 | Paul Phillips | 2013-03-12 | 1 | -1/+2 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | SI-6725 `f` interpolator now supports %n tokens | Eugene Burmako | 2013-03-09 | 1 | -1/+2 | |
| | | |/ / / / / / / | | |/| | | | | | | | ||||||
| * | | | | | | | | | Merge pull request #2227 from mergeconflict/2.10.x-SI-7132 | Paul Phillips | 2013-03-12 | 1 | -5/+7 | |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | ||||||
| | * | | | | | | | | SI-7132 - don't discard Unit type in interpreter | Dan Rosen | 2013-03-09 | 1 | -5/+7 | |
* | | | | | | | | | | 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 | 1 | -18/+36 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Iterator.++ no longer blows the stack. | Paul Phillips | 2013-03-26 | 1 | -18/+36 | |
| | |_|_|_|/ / / / | |/| | | | | | | | ||||||
* | | | | | | | | | 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 | 22 | -190/+206 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Overhauled local/getter/setter name logic. | Paul Phillips | 2013-03-25 | 22 | -190/+206 | |
| | |_|_|_|_|/ / / | |/| | | | | | | | ||||||
* | | | | | | | | | 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 | 1 | -9/+9 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Merge master. | Adriaan Moors | 2013-03-25 | 113 | -1027/+1717 | |
| |\| | | | | | | | ||||||
| * | | | | | | | | Merge 2.10.x into master | Adriaan Moors | 2013-03-25 | 2 | -11/+12 | |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | ||||||
| | * | | | | | | | Sanity for build.xml: exscriptus&positus delendus est. | Adriaan Moors | 2013-03-23 | 1 | -9/+9 | |
| | | |/ / / / / | | |/| | | | | | ||||||
* | | | | | | | | Cleanup obsolete options in CodeGen. | Jason Zaugg | 2013-03-24 | 2 | -5/+1 | |
* | | | | | | | | SI-7294 Deprecate inheritance from TupleN. | Jason Zaugg | 2013-03-24 | 24 | -1/+24 | |
* | | | | | | | | SI-7294 Treat TupleN as final under -Xfuture | Jason Zaugg | 2013-03-24 | 1 | -2/+9 | |
| |_|/ / / / / |/| | | | | | | ||||||
* | | | | | | | 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 | 4 | -9/+72 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | The script engine is given a better binding mechanism and reflexive access | Raphael Jolly | 2013-03-22 | 2 | -4/+61 | |
| * | | | | | | | | 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 | 2 | -28/+33 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | SI-5717 error when bytecode cannot be written | Som Snytt | 2013-03-22 | 2 | -28/+33 | |
* | | | | | | | | | | Merge pull request #2259 from Blaisorblade/issue/6123-try-3 | Paul Phillips | 2013-03-22 | 2 | -6/+8 | |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | SI-6123: -explaintypes should not explain errors which won't be reported | Paolo G. Giarrusso | 2013-03-15 | 2 | -6/+8 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #2287 from vigdorchik/ticket/si-7102 | James Iry | 2013-03-22 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | SI-7102 Specialize isEmpty for bitsets | Eugene Vigdorchik | 2013-03-21 | 1 | -0/+2 | |
| | |/ / / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #2239 from paulp/pr/warnings | Adriaan Moors | 2013-03-21 | 45 | -164/+130 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Removed dead src directory. | Paul Phillips | 2013-03-12 | 1 | -1/+0 | |
| * | | | | | | | | Eliminate a bunch of -Xlint warnings. | Paul Phillips | 2013-03-12 | 43 | -162/+113 | |
| * | | | | | | | | Warn about forgotten string interpolators. | Paul Phillips | 2013-03-12 | 2 | -1/+17 | |
* | | | | | | | | | Merge pull request #2262 from mesagie/patch-4 | James Iry | 2013-03-20 | 1 | -5/+4 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | removed a redundant var in JavaWriter.flagsToStr | Sagie Davidovich | 2013-03-15 | 1 | -5/+4 | |
* | | | | | | | | | | Merge pull request #2251 from soc/SI-7236 | James Iry | 2013-03-20 | 2 | -14/+14 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | SI-7236 Deprecate ThreadPoolTaskSupport and friends | Simon Ochsenreither | 2013-03-13 | 2 | -14/+14 | |
* | | | | | | | | | | | Merge pull request #2235 from vigdorchik/si_5513 | James Iry | 2013-03-20 | 1 | -1/+50 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | SI-5513: add inplace set-theoretic operations for mutable bitsets. | Eugene Vigdorchik | 2013-03-11 | 1 | -1/+50 | |
* | | | | | | | | | | | | Merge pull request #2219 from chuvoks/rbtRebalance | James Iry | 2013-03-20 | 1 | -24/+45 | |
|\ \ \ \ \ \ \ \ \ \ \ \ |