diff options
author | Paul Phillips <paulp@improving.org> | 2013-04-24 12:51:13 -0700 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2013-04-24 12:51:13 -0700 |
commit | 62b6bdc088db2e3607814dfd2f83714bec97b935 (patch) | |
tree | 0376965e18d6cd5d61cd14544323897dc1390e23 /src/library | |
parent | cdffcf8962c9fa606c027fcb5a50a4273976a576 (diff) | |
parent | 10845adebe741fc2bb5bce70df0a8da7788aa722 (diff) | |
download | scala-62b6bdc088db2e3607814dfd2f83714bec97b935.tar.gz scala-62b6bdc088db2e3607814dfd2f83714bec97b935.tar.bz2 scala-62b6bdc088db2e3607814dfd2f83714bec97b935.zip |
Merge branch 'master' into pr/warning-cleanup
Conflicts:
src/compiler/scala/tools/nsc/typechecker/Contexts.scala
Diffstat (limited to 'src/library')
-rw-r--r-- | src/library/scala/collection/immutable/List.scala | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/library/scala/collection/immutable/List.scala b/src/library/scala/collection/immutable/List.scala index be233d06cb..f3559f7d26 100644 --- a/src/library/scala/collection/immutable/List.scala +++ b/src/library/scala/collection/immutable/List.scala @@ -85,7 +85,8 @@ sealed abstract class List[+A] extends AbstractSeq[A] with LinearSeq[A] with Product with GenericTraversableTemplate[A, List] - with LinearSeqOptimized[A, List[A]] { + with LinearSeqOptimized[A, List[A]] + with Serializable { override def companion: GenericCompanion[List] = List import scala.collection.{Iterable, Traversable, Seq, IndexedSeq} |