[scala-2.10] 32/166: Merge commit 'upstream/2.7.4'

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository scala-2.10.

commit 29b89c37865c3f5274a1c8ed9a582e0eaec22161
Merge: 29a4e38 5b89e71
Author: Mehdi Dogguy <dogguy at pps.jussieu.fr>
Date:   Fri Apr 24 17:59:12 2009 +0200

    Merge commit 'upstream/2.7.4'

 .settings/org.eclipse.jdt.core.prefs               |   4 -
 META-INF/MANIFEST.MF                               |   2 +-
 build.number                                       |   2 +-
 build.xml                                          |   8 +-
 lib/scala-compiler.jar                             | Bin 5922315 -> 5962763 bytes
 lib/scala-library-src.jar                          | Bin 641246 -> 640207 bytes
 lib/scala-library.jar                              | Bin 3690322 -> 3708736 bytes
 partestLog                                         | 946 +++++++++++----------
 src/actors/scala/actors/Actor.scala                |   7 +-
 src/actors/scala/actors/FJTaskScheduler2.scala     |   7 +-
 src/actors/scala/actors/Reaction.scala             |   5 +-
 src/actors/scala/actors/Scheduler.scala            |   4 +-
 src/actors/scala/actors/remote/RemoteActor.scala   |  19 +-
 src/actors/scala/actors/remote/TcpService.scala    |   4 +-
 src/build/four.xml                                 |  21 +-
 src/build/maven/maven-deploy.xml                   |   4 +-
 src/build/maven/scala-compiler-pom.xml             |  25 +
 src/build/maven/scala-dbc-pom.xml                  |  24 +
 src/build/maven/scala-library-pom.xml              |  24 +
 src/build/maven/scala-swing-pom.xml                |  24 +
 src/build/pack.xml                                 |   3 +
 src/compiler/scala/tools/nsc/CompileClient.scala   |  10 +-
 src/compiler/scala/tools/nsc/CompileSocket.scala   |   4 +-
 src/compiler/scala/tools/nsc/CompilerCommand.scala |  12 +-
 src/compiler/scala/tools/nsc/Interpreter.scala     |   4 +-
 src/compiler/scala/tools/nsc/Settings.scala        |   5 +-
 .../scala/tools/nsc/backend/jvm/GenJVM.scala       |   6 +-
 src/compiler/scala/tools/nsc/doc/script.js         |   4 +-
 .../scala/tools/nsc/symtab/Definitions.scala       |   4 +-
 src/compiler/scala/tools/nsc/symtab/Symbols.scala  |  23 +-
 src/compiler/scala/tools/nsc/symtab/Types.scala    |   4 +-
 .../scala/tools/nsc/transform/CleanUp.scala        |  36 +-
 .../scala/tools/nsc/transform/LazyVals.scala       |   5 +-
 .../scala/tools/nsc/util/ArgumentsExpander.scala   |  42 +
 .../scala/tools/nsc/util/NameTransformer.scala     |   4 +-
 src/library/scala/List.scala                       |  13 +-
 src/library/scala/Seq.scala                        |  13 +-
 .../unchecked}/uncheckedStable.scala               |   2 +-
 src/library/scala/collection/immutable/Stack.scala |  10 +-
 src/library/scala/runtime/ScalaRunTime.scala       |   5 +-
 src/library/scala/util/logging/ConsoleLogger.scala |   6 +-
 src/library/scala/util/logging/Logged.scala        |   4 +-
 .../util/parsing/combinator/JavaTokenParsers.scala |   4 +-
 src/partest/scala/tools/partest/PartestTask.scala  |  16 +-
 src/swing/scala/swing/ButtonGroup.scala            |   2 +-
 test/files/jvm/t1143-2.check                       |   1 +
 test/files/jvm/t1143-2/Marker.java                 |   4 +
 test/files/jvm/t1143-2/t1143-2.scala               |  66 ++
 test/files/neg/t1659.check                         |   5 +
 test/files/neg/t1659.scala                         |   4 +
 test/files/pos/t1648.scala                         |   4 +
 test/files/pos5/t1711/Seq.scala                    |  12 +
 test/files/pos5/t1711/Test.java                    |   6 +
 test/files/run/jtptest.check                       |   7 +
 test/files/run/jtptest.scala                       |  17 +
 test/files/run/lazy-locals.scala                   |   8 +
 test/files/run/lists.scala                         |  39 +-
 57 files changed, 941 insertions(+), 603 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/scala-2.10.git