summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Removed unused imports.Paul Phillips2012-11-06174-393/+79
* Merge pull request #1576 from paulp/merge-210Adriaan Moors2012-11-061322-3780/+1984
|\
| * Merge commit 'refs/pull/1574/head' into merge-210Paul Phillips2012-11-051322-3780/+1984
| |\
| | * Merge branch '2.10.0-wip' into merge-2.10.0Josh Suereth2012-11-051332-3797/+1970
| | |\
| | | * Merge pull request #1569 from jsuereth/fix/osgi-manifestsv2.10.0-RC2Adriaan Moors2012-11-041-1/+2
| | | |\
| | | | * Fixing issue where OSGi bundles weren't getting used for distribution.Josh Suereth2012-11-041-1/+2
| | | * | Merge pull request #1566 from densh/topic/asSeenFrom-exampleJosh Suereth2012-11-041-4/+20
| | | |\ \
| | | | * | Fixes example in Type.asSeenFromDen Shabalin2012-11-031-4/+20
| | | | |/
| | | * | Merge pull request #1559 from heathermiller/copyright-updateJosh Suereth2012-11-041240-1249/+1248
| | | |\ \ | | | | |/ | | | |/|
| | | | * Brings copyrights in Scaladoc footer and manpage up-to-date, from 2011/12 to ...Heather Miller2012-11-022-2/+2
| | | | * Brings all copyrights (in comments) up-to-date, from 2011/12 to 2013Heather Miller2012-11-021240-1247/+1246
| | | * | Merge pull request #1562 from paulp/issue/6600Josh Suereth2012-11-023-6/+23
| | | |\ \
| | | | * | Fix for SI-6600, regression with ScalaNumber.Paul Phillips2012-11-023-6/+23
| | | * | | Merge pull request #1561 from gkossakowski/ticket/6562Adriaan Moors2012-11-024-8/+31
| | | |\ \ \ | | | | |/ / | | | |/| |
| | | | * | SI-6562 Fix crash with class nested in @inline methodJason Zaugg2012-11-024-8/+31
| | | |/ /
| | | * | Merge pull request #1558 from heathermiller/doc/reflection-errataJosh Suereth2012-11-0248-279/+459
| | | |\ \ | | | | |/ | | | |/|
| | | | * SI-6606 Drops new icons in, replaces abstract types placeholder iconsHeather Miller2012-11-024-0/+0
| | | | * SI-6132 Revisited, cleaned-up, links fixed, spelling errors fixed, rewordingsHeather Miller2012-11-0226-194/+227
| | | | * Labeling scala.reflect and scala.reflect.macros experimental in the API docsHeather Miller2012-11-0238-56/+184
| | | | * Typo-fix in scala.concurrent.Future, thanks to @pavelpavlovHeather Miller2012-11-021-1/+1
| | | | * Remove implementation details from Position (they are still under reflection....Hubert Plociniczak2012-11-021-29/+2
| | | | * SI-6399 Adds API docs for Any and AnyValHeather Miller2012-11-022-5/+51
| | | |/
| | | * Merge pull request #1526 from paulp/value-classes/6534-equalsAdriaan Moors2012-11-015-1/+60
| | | |\
| | | | * Modification to SI-6534 patch.Paul Phillips2012-10-303-10/+18
| | | | * New take on SI-6534, value classes.Paul Phillips2012-10-245-1/+52
| | | * | Merge pull request #1540 from odersky/ticket/6500Adriaan Moors2012-11-012-2/+17
| | | |\ \
| | | | * | Fixes SI-6500 by making erasure more regular.Martin Odersky2012-10-302-2/+17
| | | | |/
| | | * | Merge pull request #1542 from adriaanm/odersky-ticket/6556v2Adriaan Moors2012-11-012-1/+45
| | | |\ \
| | | | * | SI-6556 no assert for surprising ctor result typeMartin Odersky2012-10-302-1/+45
| | | | |/
| | | * | Merge pull request #1541 from jsuereth/fix/SI-6577-actors-migrationJosh Suereth2012-11-0148-2267/+11
| | | |\ \
| | | | * | Removing actors-migration from main repository so it can live on elsewhere.Josh Suereth2012-11-014-111/+2
| | | | * | Merge branch '2.10.0-wip' of github.com:scala/scala into 2.10.0-wipJosh Suereth2012-11-0117-35/+161
| | | | |\ \ | | | | |/ / | | | |/| |
| | | * | | Merge pull request #1543 from adriaanm/paulp-add-synthetics-onceJosh Suereth2012-10-311-6/+25
| | | |\ \ \
| | | | * | | SI-6578 Harden against synthetics being added more than once.Paul Phillips2012-10-301-6/+25
| | | | | |/ | | | | |/|
| | | * | | Merge pull request #1536 from vjovanov/issues/SI-6581Josh Suereth2012-10-314-6/+41
| | | |\ \ \
| | | | * | | SI-6581 fixed by inlining `Actor.self`.Vojin Jovanovic2012-10-304-6/+41
| | | | |/ /
| | | * | | Merge pull request #1532 from hubertp/2.10.0-wip-issue/5031Josh Suereth2012-10-315-3/+24
| | | |\ \ \
| | | | * | | Fixes SI-5031 for separate compilation scenario.Hubert Plociniczak2012-10-285-3/+24
| | | | |/ /
| | | | | * Removing actors-migration from main repository so it can live on elsewhere.Josh Suereth2012-10-3044-2156/+9
| | | | |/
| | * | | Merge pull request #1551 from adriaanm/paulp-issue-6597-2.10.xAdriaan Moors2012-11-013-1/+10
| | |\ \ \
| | | * | | Fix for SI-6597, implicit case class crasher.Paul Phillips2012-10-313-1/+10
| | |/ / /
| | * | | Merge pull request #1546 from paulp/merge-2.10.0-wipJosh Suereth2012-10-3128-819/+412
| | |\ \ \
| | * \ \ \ Merge pull request #1522 from possiblywrong/2.10.xJosh Suereth2012-10-313-1/+16
| | |\ \ \ \
| | | * | | | SI-6488: Stop I/O threads prior to Process destructionDeclan Conlon2012-10-263-1/+16
| | * | | | | Merge pull request #1537 from jsuereth/fix/SI-6559-2.10.xJosh Suereth2012-10-312-1/+18
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Fixes SI-6559 - StringContext not using passed in escape function.Josh Suereth2012-10-302-1/+18
| | |/ / / /
* | | | | | Merge pull request #1582 from retronym/ticket/revert-primitive-array-optJosh Suereth2012-11-065-105/+15
|\ \ \ \ \ \
| * | | | | | Revert "Expand optimization of Array(e1, ..., en) to primitive arrays."Jason Zaugg2012-11-065-106/+11
| * | | | | | Revert "Refactor guards checking for a particular overload of Array.apply."Jason Zaugg2012-11-062-4/+9
|/ / / / / /
* | | | | | Merge pull request #1568 from retronym/ticket/6611Paul Phillips2012-11-057-14/+141
|\ \ \ \ \ \ | |/ / / / / |/| | | | |