diff options
| author | Aleksandar Pokopec <aleksandar.prokopec@epfl.ch> | 2011-01-26 08:37:23 +0000 |
|---|---|---|
| committer | Aleksandar Pokopec <aleksandar.prokopec@epfl.ch> | 2011-01-26 08:37:23 +0000 |
| commit | 78a48c46cf3727dd06179cb1360b2f9057647042 (patch) | |
| tree | 01f418fab8ee1cd61c5a6a891bdce09cde142098 /test/files/scalacheck | |
| parent | 78007ac467c9d6e88ae183a9126772829072704c (diff) | |
| download | scala-78a48c46cf3727dd06179cb1360b2f9057647042.tar.gz scala-78a48c46cf3727dd06179cb1360b2f9057647042.tar.bz2 scala-78a48c46cf3727dd06179cb1360b2f9057647042.zip | |
Merge branch 'work'
Conflicts:
src/library/scala/concurrent/SyncVar.scala
Diffstat (limited to 'test/files/scalacheck')
| -rw-r--r-- | test/files/scalacheck/Unrolled.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/files/scalacheck/Unrolled.scala b/test/files/scalacheck/Unrolled.scala index d69e62dd01..34604b8667 100644 --- a/test/files/scalacheck/Unrolled.scala +++ b/test/files/scalacheck/Unrolled.scala @@ -2,7 +2,7 @@ import org.scalacheck._ import Prop._ import Gen._ -import collection.parallel.UnrolledBuffer +import collection.mutable.UnrolledBuffer object Test extends Properties("UnrolledBuffer") { |