summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2254 from paulp/pr/buildxmlv2.11.0-M2Adriaan Moors2013-03-131-0/+1
|\
| * Restore sketchy dependency to quick.bin.Paul Phillips2013-03-131-0/+1
|/
* Merge pull request #2215 from paulp/issue/7228Paul Phillips2013-03-1310-49/+128
|\
| * Fix it-never-happened performance regression.Paul Phillips2013-03-131-3/+4
| * Moved some numeric subtyping logic closer to center.Paul Phillips2013-03-103-17/+25
| * Simplified the widening logic.Paul Phillips2013-03-104-17/+15
| * SI-7228, bug in weak subtyping.Paul Phillips2013-03-105-19/+91
* | Merge pull request #2242 from adriaanm/merge-2.10.xPaul Phillips2013-03-1320-12/+336
|\ \
| * \ Merge 2.10.x into masterAdriaan Moors2013-03-1217-10/+167
| |\ \
| | * \ Merge pull request #2224 from retronym/ticket/7238Adriaan Moors2013-03-113-3/+16
| | |\ \
| | | * | SI-7328 Bail out of names/defaults if args are error typedJason Zaugg2013-03-093-3/+16
| | * | | Merge pull request #2225 from retronym/ticket/7234Adriaan Moors2013-03-113-7/+45
| | |\ \ \
| | | * | | SI-7234 Make named args play nice with dep. method typesJason Zaugg2013-03-093-7/+45
| | * | | | Merge pull request #2221 from scalamacros/ticket/5710Adriaan Moors2013-03-114-0/+32
| | |\ \ \ \
| | | * | | | SI-5710 has fixed itselfEugene Burmako2013-03-094-0/+32
| | * | | | | Merge pull request #2223 from scalamacros/ticket/7235Adriaan Moors2013-03-116-0/+42
| | |\ \ \ \ \
| | | * | | | | reifier is now aware of SI-7235Eugene Burmako2013-03-096-0/+42
| | | |/ / / /
| | * | | | | Merge pull request #2228 from retronym/ticket/7226Adriaan Moors2013-03-112-0/+32
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | | * | | | SI-7226 Fix inference regression caused by TypeVar equality.Jason Zaugg2013-03-092-0/+32
| | |/ / / /
| | * | | | Merge pull request #2212 from dragos/fix/SI-7224James Iry2013-03-083-2/+169
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Merge 2.10.x into masterAdriaan Moors2013-03-123-2/+169
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Fix SI-7224.Iulian Dragos2013-03-073-2/+169
| | |/ / /
* | | | | Merge pull request #2246 from paulp/pr/sbtPaul Phillips2013-03-132-3/+5
|\ \ \ \ \
| * | | | | Update sbt.latest.version to sbt's latest version.Paul Phillips2013-03-132-3/+5
|/ / / / /
* | | | | Merge pull request #2236 from retronym/ticket/6601-2Paul Phillips2013-03-128-2/+33
|\ \ \ \ \
| * | | | | SI-6601 Close access loophole for value class constructorsJason Zaugg2013-03-118-2/+33
| | |_|_|/ | |/| | |
* | | | | Merge pull request #2240 from paulp/pr/warn-forward-referencePaul Phillips2013-03-124-0/+68
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Warn about locally identifiable init order issues.Paul Phillips2013-03-124-0/+68
* | | | | Merge pull request #2241 from adriaanm/eclipse-replAdriaan Moors2013-03-124-0/+51
|\ \ \ \ \
| * | | | | update eclipse projects (partest, repl & scaladoc)Adriaan Moors2013-03-124-0/+51
|/ / / / /
* | | | | Merge pull request #2238 from adriaanm/pr-2206-rebasedAdriaan Moors2013-03-1210-44/+267
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | SI-874 actual JSR-223 implementationRaphael Jolly2013-03-117-29/+177
| * | | | SI-874 reflect.io improvementsRaphael Jolly2013-03-113-15/+90
* | | | | Merge pull request #2231 from retronym/topic/ide-configAdriaan Moors2013-03-119-0/+190
|\ \ \ \ \
| * | | | | Add eclipse projects for interactive, scaladoc.Jason Zaugg2013-03-104-0/+89
| * | | | | IntellIiJ module definitions for scaladoc, interactive and continuations-*.Jason Zaugg2013-03-105-0/+101
| | |/ / / | |/| | |
* | | | | Merge pull request #2237 from som-snytt/topic/slurpeeAdriaan Moors2013-03-111-1/+4
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Close after slurping (fixes SI-7244)Som Snytt2013-03-111-1/+4
| |/ / /
* | | | Merge pull request #2229 from srinivasreddy/masterAdriaan Moors2013-03-111-1/+1
|\ \ \ \
| * | | | a typo correctedsrinivasreddy2013-03-101-1/+1
* | | | | Merge pull request #2232 from paulp/pr/modularize-replAdriaan Moors2013-03-1160-811/+823
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Modularized the repl.Paul Phillips2013-03-1160-811/+823
|/ / / /
* | | | Merge pull request #2201 from retronym/topic/types-break-down-squashAdriaan Moors2013-03-107-2649/+2732
|\ \ \ \
| * | | | Carve up Types.scalaJason Zaugg2013-03-057-2649/+2732
* | | | | Merge pull request #2226 from adriaanm/pr-2208-reworkAdriaan Moors2013-03-10174-688/+842
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Deprecated custom ant task 'Same'.Paul Phillips2013-03-092-3/+1
| * | | | Eliminated all forInteractive/forScaladoc uses.Paul Phillips2013-03-0917-100/+75
| * | | | Moved interactive code into src/interactive.Paul Phillips2013-03-092-3/+116
| * | | | Moved scaladoc code into src/scaladoc.Paul Phillips2013-03-0914-223/+340
| * | | | Give interactive tests their own target.Paul Phillips2013-03-091-14/+19