[scala-2.10] 39/166: Merge commit 'upstream/2.7.5.dfsg'

[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 0975bf351fa88978b64248b0d2a12cefc09a56a2
Merge: a8f5d8b 2424dca
Author: Mehdi Dogguy <dogguy at pps.jussieu.fr>
Date:   Tue Jun 2 19:45:47 2009 +0200

    Merge commit 'upstream/2.7.5.dfsg'

 META-INF/MANIFEST.MF                               |   2 +-
 anttestsuitelog                                    | 787 --------------------
 build.number                                       |   2 +-
 partestLog                                         | 798 ---------------------
 partestLog2                                        | 792 --------------------
 scala/trunk/test/files/run/t1620.check             |   6 -
 scala/trunk/test/files/run/t1620.scala             |  16 -
 src/actors/scala/actors/Actor.scala                |  12 +-
 src/actors/scala/actors/ActorGC.scala              |  23 -
 src/actors/scala/actors/FJTaskScheduler2.scala     |   4 +-
 src/actors/scala/actors/Scheduler.scala            |  14 +-
 src/actors/scala/actors/TickedScheduler.scala      |   4 +-
 src/compiler/scala/tools/nsc/doc/script.js         |   4 +-
 .../scala/actors/FJTaskScheduler2.scala            |   2 -
 src/library/scala/io/BufferedSource.scalaQ         | 115 ---
 src/library/scala/io/BufferedSource.scalan         | 131 ----
 test/files/jvm/terminateLinked.check               |   1 +
 test/files/jvm/terminateLinked.scala               |  24 +
 trunk/test/files/run/t1620.check                   |   6 -
 trunk/test/files/run/t1620.scala                   |  16 -
 zz                                                 |   2 -
 21 files changed, 48 insertions(+), 2713 deletions(-)

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