Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Merge pull request #1373 from smessmer/2.10.x | Grzegorz Kossakowski | 2012-09-24 | 4 | -4/+4 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Changed implementation comments from /** */ to /* */, so ScalaDoc remains rea... | smessmer | 2012-09-21 | 4 | -4/+4 | |
* | | | | | Merge pull request #1378 from scalamacros/ticket/5918 | Eugene Burmako | 2012-09-23 | 5 | -44/+58 | |
|\ \ \ \ \ | ||||||
| * | | | | | SI-5918 fixes the ConstantType ugliness | Eugene Burmako | 2012-09-23 | 5 | -44/+58 | |
| | |_|_|/ | |/| | | | ||||||
* | | | | | Merge pull request #1377 from scalamacros/topic/partest-always-lf | Paul Phillips | 2012-09-22 | 2 | -4/+23 | |
|\ \ \ \ \ | ||||||
| * | | | | | partest now always produces log files with LFs | Eugene Burmako | 2012-09-22 | 2 | -4/+23 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #1379 from retronym/topic/boxing-conversions | Paul Phillips | 2012-09-22 | 3 | -5/+10 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Remove BoxingConversions from the scala package. | Jason Zaugg | 2012-09-22 | 3 | -5/+10 | |
* | | | | | A couple CRLF normalization stragglers. | Paul Phillips | 2012-09-21 | 3 | -7/+7 | |
* | | | | | Merge pull request #1370 from pavelpavlov/SI-5767 | Grzegorz Kossakowski | 2012-09-21 | 1 | -2/+0 | |
|\ \ \ \ \ | ||||||
| * | | | | | LinkedHashSet scaladoc fix after FlatHashTable->HashTable transiton | Pavel Pavlov | 2012-09-21 | 1 | -2/+0 | |
* | | | | | | Merge pull request #1371 from xuwei-k/fix_scaladoc | Grzegorz Kossakowski | 2012-09-21 | 2 | -2/+2 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | fix scala.collection.TraversableLike scaladoc | xuwei-k | 2012-09-21 | 1 | -1/+1 | |
| * | | | | | | fix Subscriber scaladoc | xuwei-k | 2012-09-21 | 1 | -1/+1 | |
|/ / / / / / | ||||||
* | | | | | | Merge remote-tracking branch 'paulp/treecheckers' into 2.10.x | Paul Phillips | 2012-09-20 | 1 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix for loud test. | Paul Phillips | 2012-09-20 | 1 | -1/+1 | |
| | |_|_|/ / | |/| | | | | ||||||
* | | | | | | Merge remote-tracking branch 'paulp/topic/gitattributes' into 2.10.x | Paul Phillips | 2012-09-20 | 340 | -2948/+2992 | |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | ||||||
| * | | | | | Normalized line endings. | Paul Phillips | 2012-09-20 | 336 | -2948/+2948 | |
| * | | | | | New .gitattributes file. | Paul Phillips | 2012-09-20 | 4 | -0/+44 | |
* | | | | | | Merge pull request #1348 from scalamacros/ticket/6394 | Grzegorz Kossakowski | 2012-09-20 | 5 | -1/+19 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | SI-6394 fixes macros.Context.enclosingClass | Eugene Burmako | 2012-09-19 | 5 | -1/+19 | |
* | | | | | | | Merge pull request #1325 from odersky/ticket/6337 | Paul Phillips | 2012-09-20 | 5 | -10/+42 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fixed comment. | Martin Odersky | 2012-09-17 | 1 | -0/+1 | |
| * | | | | | | | Fixes SI-6337 by disallowing nested value classes. | Martin Odersky | 2012-09-17 | 5 | -10/+41 | |
* | | | | | | | | Merge pull request #1344 from jsuereth/wip/osgi-support | Eugene Burmako | 2012-09-20 | 30 | -34/+521 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Additional OSGi tests. | Josh Suereth | 2012-09-19 | 5 | -8/+112 | |
| * | | | | | | | | Adds very simplistic reflection in OSGi test. Provides the framework | Josh Suereth | 2012-09-18 | 1 | -0/+66 | |
| * | | | | | | | | Adds OSGi support / tests to Scala. Fixes SI-5822. | Josh Suereth | 2012-09-18 | 10 | -7/+274 | |
| * | | | | | | | | Fixes SI-6305 scala.tools.nsc.io split between jars. | Josh Suereth | 2012-09-18 | 17 | -27/+77 | |
* | | | | | | | | | Merge pull request #1356 from paulp/pullreq-1342 | Josh Suereth | 2012-09-20 | 6 | -23/+39 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Error message improvement for SI-6336. | Paul Phillips | 2012-09-19 | 5 | -24/+31 | |
| * | | | | | | | | | SI-6336 Now also catches return types | Martin Odersky | 2012-09-18 | 3 | -3/+12 | |
* | | | | | | | | | | Merge pull request #1339 from rkuhn/wip-6389-finite-duration-mult | Josh Suereth | 2012-09-20 | 29 | -283/+443 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | some small remaining fixes | Roland | 2012-09-20 | 5 | -28/+58 | |
| * | | | | | | | | | | Adjustments to scala.concurrent.duration. | Paul Phillips | 2012-09-19 | 6 | -206/+221 | |
| * | | | | | | | | | | move Duration (incl. DSL) into scala.concurrent.duration package | Roland | 2012-09-19 | 26 | -62/+53 | |
| * | | | | | | | | | | improve performance of integer multiplication overflow check on Duration | Roland | 2012-09-19 | 2 | -20/+106 | |
| * | | | | | | | | | | enable integer multiplication/divison on FiniteDuration, see SI-6389 | Roland | 2012-09-18 | 2 | -4/+42 | |
* | | | | | | | | | | | Merge pull request #1363 from jsuereth/wip/use-faster-repo | Josh Suereth | 2012-09-20 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Use faster download URL now that artifactory is fixed. | Josh Suereth | 2012-09-20 | 1 | -1/+1 | |
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #1360 from scalamacros/hotfix/sbt | Eugene Burmako | 2012-09-20 | 7 | -6/+135 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | don't try to create tags w/o scala-reflect.jar | Eugene Burmako | 2012-09-20 | 7 | -6/+135 | |
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'pull-1352-reformatted' into 2.10.x | Paul Phillips | 2012-09-20 | 24 | -57/+258 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Disabled failing build manager tests. | Martin Odersky | 2012-09-20 | 6 | -1/+1 | |
| * | | | | | | | | | | New test case for SI-6337 | Martin Odersky | 2012-09-20 | 1 | -0/+16 | |
| * | | | | | | | | | | New test case for closing SI-6385 | Martin Odersky | 2012-09-20 | 2 | -0/+20 | |
| * | | | | | | | | | | Value classes: eliminated half-boxing | Martin Odersky | 2012-09-20 | 9 | -18/+87 | |
| * | | | | | | | | | | Cleanup of OverridingPairs | Martin Odersky | 2012-09-20 | 1 | -17/+22 | |
| * | | | | | | | | | | Fixes SI-6260 | Martin Odersky | 2012-09-20 | 6 | -21/+112 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #1353 from gkossakowski/SI-6376-scalap-is-broken | Grzegorz Kossakowski | 2012-09-20 | 1 | -3/+8 | |
|\ \ \ \ \ \ \ \ \ \ |