From 78a48c46cf3727dd06179cb1360b2f9057647042 Mon Sep 17 00:00:00 2001 From: Aleksandar Pokopec Date: Wed, 26 Jan 2011 08:37:23 +0000 Subject: Merge branch 'work' Conflicts: src/library/scala/concurrent/SyncVar.scala --- test/files/run/UnrolledBuffer.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/files/run/UnrolledBuffer.scala') diff --git a/test/files/run/UnrolledBuffer.scala b/test/files/run/UnrolledBuffer.scala index 7e113c3e04..62a1f7d083 100644 --- a/test/files/run/UnrolledBuffer.scala +++ b/test/files/run/UnrolledBuffer.scala @@ -2,7 +2,7 @@ -import collection.parallel.UnrolledBuffer +import collection.mutable.UnrolledBuffer -- cgit v1.2.3