From 78a48c46cf3727dd06179cb1360b2f9057647042 Mon Sep 17 00:00:00 2001
From: Aleksandar Pokopec <aleksandar.prokopec@epfl.ch>
Date: Wed, 26 Jan 2011 08:37:23 +0000
Subject: Merge branch 'work'

Conflicts:
	src/library/scala/concurrent/SyncVar.scala
---
 test/files/jvm/serialization.scala | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'test/files/jvm/serialization.scala')

diff --git a/test/files/jvm/serialization.scala b/test/files/jvm/serialization.scala
index 8c4df8fc37..6a4e37bda9 100644
--- a/test/files/jvm/serialization.scala
+++ b/test/files/jvm/serialization.scala
@@ -604,9 +604,9 @@ object Test9_parallel {
     println()
 
     // UnrolledBuffer
-    val ub = new UnrolledBuffer[String]
+    val ub = new collection.mutable.UnrolledBuffer[String]
     ub ++= List("one", "two")
-    val _ub: UnrolledBuffer[String] = read(write(ub))
+    val _ub: collection.mutable.UnrolledBuffer[String] = read(write(ub))
     check(ub, _ub)
 
     // mutable.ParArray
-- 
cgit v1.2.3