Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 2.10.x into master | Adriaan Moors | 2013-03-12 | 17 | -10/+167 |
|\| | |||||
| * | Merge pull request #2224 from retronym/ticket/7238 | Adriaan Moors | 2013-03-11 | 3 | -3/+16 |
| |\ | |||||
| | * | SI-7328 Bail out of names/defaults if args are error typed | Jason Zaugg | 2013-03-09 | 3 | -3/+16 |
| * | | Merge pull request #2225 from retronym/ticket/7234 | Adriaan Moors | 2013-03-11 | 3 | -7/+45 |
| |\ \ | |||||
| | * | | SI-7234 Make named args play nice with dep. method types | Jason Zaugg | 2013-03-09 | 3 | -7/+45 |
| * | | | Merge pull request #2221 from scalamacros/ticket/5710 | Adriaan Moors | 2013-03-11 | 4 | -0/+32 |
| |\ \ \ | |||||
| | * | | | SI-5710 has fixed itself | Eugene Burmako | 2013-03-09 | 4 | -0/+32 |
| * | | | | Merge pull request #2223 from scalamacros/ticket/7235 | Adriaan Moors | 2013-03-11 | 6 | -0/+42 |
| |\ \ \ \ | |||||
| | * | | | | reifier is now aware of SI-7235 | Eugene Burmako | 2013-03-09 | 6 | -0/+42 |
| | |/ / / | |||||
| * | | | | Merge pull request #2228 from retronym/ticket/7226 | Adriaan Moors | 2013-03-11 | 2 | -0/+32 |
| |\ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | SI-7226 Fix inference regression caused by TypeVar equality. | Jason Zaugg | 2013-03-09 | 2 | -0/+32 |
| |/ / / | |||||
| * | | | Merge pull request #2212 from dragos/fix/SI-7224 | James Iry | 2013-03-08 | 3 | -2/+169 |
| |\ \ \ | | |_|/ | |/| | | |||||
* | | | | Merge 2.10.x into master | Adriaan Moors | 2013-03-12 | 3 | -2/+169 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Fix SI-7224. | Iulian Dragos | 2013-03-07 | 3 | -2/+169 |
| |/ / | |||||
* | | | Merge pull request #2241 from adriaanm/eclipse-repl | Adriaan Moors | 2013-03-12 | 4 | -0/+51 |
|\ \ \ | |||||
| * | | | update eclipse projects (partest, repl & scaladoc) | Adriaan Moors | 2013-03-12 | 4 | -0/+51 |
|/ / / | |||||
* | | | Merge pull request #2238 from adriaanm/pr-2206-rebased | Adriaan Moors | 2013-03-12 | 10 | -44/+267 |
|\ \ \ | |||||
| * | | | SI-874 actual JSR-223 implementation | Raphael Jolly | 2013-03-11 | 7 | -29/+177 |
| * | | | SI-874 reflect.io improvements | Raphael Jolly | 2013-03-11 | 3 | -15/+90 |
* | | | | Merge pull request #2231 from retronym/topic/ide-config | Adriaan Moors | 2013-03-11 | 9 | -0/+190 |
|\ \ \ \ | |||||
| * | | | | Add eclipse projects for interactive, scaladoc. | Jason Zaugg | 2013-03-10 | 4 | -0/+89 |
| * | | | | IntellIiJ module definitions for scaladoc, interactive and continuations-*. | Jason Zaugg | 2013-03-10 | 5 | -0/+101 |
* | | | | | Merge pull request #2237 from som-snytt/topic/slurpee | Adriaan Moors | 2013-03-11 | 1 | -1/+4 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Close after slurping (fixes SI-7244) | Som Snytt | 2013-03-11 | 1 | -1/+4 |
| |/ / / | |||||
* | | | | Merge pull request #2229 from srinivasreddy/master | Adriaan Moors | 2013-03-11 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | a typo corrected | srinivasreddy | 2013-03-10 | 1 | -1/+1 |
* | | | | | Merge pull request #2232 from paulp/pr/modularize-repl | Adriaan Moors | 2013-03-11 | 60 | -811/+823 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Modularized the repl. | Paul Phillips | 2013-03-11 | 60 | -811/+823 |
|/ / / / | |||||
* | | | | Merge pull request #2201 from retronym/topic/types-break-down-squash | Adriaan Moors | 2013-03-10 | 7 | -2649/+2732 |
|\ \ \ \ | |||||
| * | | | | Carve up Types.scala | Jason Zaugg | 2013-03-05 | 7 | -2649/+2732 |
* | | | | | Merge pull request #2226 from adriaanm/pr-2208-rework | Adriaan Moors | 2013-03-10 | 174 | -688/+842 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Deprecated custom ant task 'Same'. | Paul Phillips | 2013-03-09 | 2 | -3/+1 |
| * | | | | Eliminated all forInteractive/forScaladoc uses. | Paul Phillips | 2013-03-09 | 17 | -100/+75 |
| * | | | | Moved interactive code into src/interactive. | Paul Phillips | 2013-03-09 | 2 | -3/+116 |
| * | | | | Moved scaladoc code into src/scaladoc. | Paul Phillips | 2013-03-09 | 14 | -223/+340 |
| * | | | | Give interactive tests their own target. | Paul Phillips | 2013-03-09 | 1 | -14/+19 |
| * | | | | Give partest its own classpath in build.xml. | Paul Phillips | 2013-03-09 | 1 | -21/+12 |
| * | | | | Teach partest the magic of abstraction. | Paul Phillips | 2013-03-09 | 3 | -34/+26 |
| * | | | | Moved interactive sources into separate directory. | Paul Phillips | 2013-03-09 | 25 | -1/+33 |
| * | | | | Moved scaladoc sources into separate directory. | Paul Phillips | 2013-03-09 | 123 | -5/+55 |
| * | | | | Enabling commit for interactive/scaladoc modules. | Paul Phillips | 2013-03-09 | 14 | -97/+111 |
| * | | | | Bring some sanity to the stability test. | Paul Phillips | 2013-03-09 | 2 | -195/+62 |
|/ / / / | |||||
* | | | | Merge pull request #2217 from JamesIry/master_7006b | James Iry | 2013-03-08 | 1 | -3/+3 |
|\ \ \ \ | |||||
| * | | | | SI-7006 Fix the unreachable test | James Iry | 2013-03-08 | 1 | -3/+3 |
|/ / / / | |||||
* | | | | Merge pull request #2216 from JamesIry/master_7231 | James Iry | 2013-03-08 | 3 | -1/+14 |
|\ \ \ \ | |||||
| * | | | | SI-7231 Fix assertion when adapting Null type to Array type | James Iry | 2013-03-08 | 3 | -1/+14 |