summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Merge pull request #1373 from smessmer/2.10.xGrzegorz Kossakowski2012-09-244-4/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Changed implementation comments from /** */ to /* */, so ScalaDoc remains rea...smessmer2012-09-214-4/+4
* | | | | Merge pull request #1378 from scalamacros/ticket/5918Eugene Burmako2012-09-235-44/+58
|\ \ \ \ \
| * | | | | SI-5918 fixes the ConstantType uglinessEugene Burmako2012-09-235-44/+58
| | |_|_|/ | |/| | |
* | | | | Merge pull request #1377 from scalamacros/topic/partest-always-lfPaul Phillips2012-09-222-4/+23
|\ \ \ \ \
| * | | | | partest now always produces log files with LFsEugene Burmako2012-09-222-4/+23
| |/ / / /
* | | | | Merge pull request #1379 from retronym/topic/boxing-conversionsPaul Phillips2012-09-223-5/+10
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Remove BoxingConversions from the scala package.Jason Zaugg2012-09-223-5/+10
* | | | | A couple CRLF normalization stragglers.Paul Phillips2012-09-213-7/+7
* | | | | Merge pull request #1370 from pavelpavlov/SI-5767Grzegorz Kossakowski2012-09-211-2/+0
|\ \ \ \ \
| * | | | | LinkedHashSet scaladoc fix after FlatHashTable->HashTable transitonPavel Pavlov2012-09-211-2/+0
* | | | | | Merge pull request #1371 from xuwei-k/fix_scaladocGrzegorz Kossakowski2012-09-212-2/+2
|\ \ \ \ \ \
| * | | | | | fix scala.collection.TraversableLike scaladocxuwei-k2012-09-211-1/+1
| * | | | | | fix Subscriber scaladocxuwei-k2012-09-211-1/+1
|/ / / / / /
* | | | | | Merge remote-tracking branch 'paulp/treecheckers' into 2.10.xPaul Phillips2012-09-201-1/+1
|\ \ \ \ \ \
| * | | | | | Fix for loud test.Paul Phillips2012-09-201-1/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge remote-tracking branch 'paulp/topic/gitattributes' into 2.10.xPaul Phillips2012-09-20340-2948/+2992
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Normalized line endings.Paul Phillips2012-09-20336-2948/+2948
| * | | | | New .gitattributes file.Paul Phillips2012-09-204-0/+44
* | | | | | Merge pull request #1348 from scalamacros/ticket/6394Grzegorz Kossakowski2012-09-205-1/+19
|\ \ \ \ \ \
| * | | | | | SI-6394 fixes macros.Context.enclosingClassEugene Burmako2012-09-195-1/+19
* | | | | | | Merge pull request #1325 from odersky/ticket/6337Paul Phillips2012-09-205-10/+42
|\ \ \ \ \ \ \
| * | | | | | | Fixed comment.Martin Odersky2012-09-171-0/+1
| * | | | | | | Fixes SI-6337 by disallowing nested value classes.Martin Odersky2012-09-175-10/+41
* | | | | | | | Merge pull request #1344 from jsuereth/wip/osgi-supportEugene Burmako2012-09-2030-34/+521
|\ \ \ \ \ \ \ \
| * | | | | | | | Additional OSGi tests.Josh Suereth2012-09-195-8/+112
| * | | | | | | | Adds very simplistic reflection in OSGi test. Provides the frameworkJosh Suereth2012-09-181-0/+66
| * | | | | | | | Adds OSGi support / tests to Scala. Fixes SI-5822.Josh Suereth2012-09-1810-7/+274
| * | | | | | | | Fixes SI-6305 scala.tools.nsc.io split between jars.Josh Suereth2012-09-1817-27/+77
* | | | | | | | | Merge pull request #1356 from paulp/pullreq-1342Josh Suereth2012-09-206-23/+39
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Error message improvement for SI-6336.Paul Phillips2012-09-195-24/+31
| * | | | | | | | | SI-6336 Now also catches return typesMartin Odersky2012-09-183-3/+12
* | | | | | | | | | Merge pull request #1339 from rkuhn/wip-6389-finite-duration-multJosh Suereth2012-09-2029-283/+443
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | some small remaining fixesRoland2012-09-205-28/+58
| * | | | | | | | | | Adjustments to scala.concurrent.duration.Paul Phillips2012-09-196-206/+221
| * | | | | | | | | | move Duration (incl. DSL) into scala.concurrent.duration packageRoland2012-09-1926-62/+53
| * | | | | | | | | | improve performance of integer multiplication overflow check on DurationRoland2012-09-192-20/+106
| * | | | | | | | | | enable integer multiplication/divison on FiniteDuration, see SI-6389Roland2012-09-182-4/+42
* | | | | | | | | | | Merge pull request #1363 from jsuereth/wip/use-faster-repoJosh Suereth2012-09-201-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Use faster download URL now that artifactory is fixed.Josh Suereth2012-09-201-1/+1
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #1360 from scalamacros/hotfix/sbtEugene Burmako2012-09-207-6/+135
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | |
| * | | | | | | | | | don't try to create tags w/o scala-reflect.jarEugene Burmako2012-09-207-6/+135
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'pull-1352-reformatted' into 2.10.xPaul Phillips2012-09-2024-57/+258
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Disabled failing build manager tests.Martin Odersky2012-09-206-1/+1
| * | | | | | | | | | New test case for SI-6337Martin Odersky2012-09-201-0/+16
| * | | | | | | | | | New test case for closing SI-6385Martin Odersky2012-09-202-0/+20
| * | | | | | | | | | Value classes: eliminated half-boxingMartin Odersky2012-09-209-18/+87
| * | | | | | | | | | Cleanup of OverridingPairsMartin Odersky2012-09-201-17/+22
| * | | | | | | | | | Fixes SI-6260Martin Odersky2012-09-206-21/+112
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #1353 from gkossakowski/SI-6376-scalap-is-brokenGrzegorz Kossakowski2012-09-201-3/+8
|\ \ \ \ \ \ \ \ \ \