diff options
| author | Antonio Cunei <antonio.cunei@epfl.ch> | 2010-09-02 10:34:31 +0000 |
|---|---|---|
| committer | Antonio Cunei <antonio.cunei@epfl.ch> | 2010-09-02 10:34:31 +0000 |
| commit | 13387444da947f6a9fa3770ec2acb227333da6cf (patch) | |
| tree | 6c6e078e5dd7f7e941ddaaccd5a82cc4c71c813b /src/library | |
| parent | 9f3ad9f11f7943d9dfe9fb664c7d58712a05f8e6 (diff) | |
| download | scala-13387444da947f6a9fa3770ec2acb227333da6cf.tar.gz scala-13387444da947f6a9fa3770ec2acb227333da6cf.tar.bz2 scala-13387444da947f6a9fa3770ec2acb227333da6cf.zip | |
Merged revisions 22411,22544,22630,22698,22724,...
Merged revisions 22411,22544,22630,22698,22724,22791-22792 via svnmerge
from https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk
........
r22411 | michelou | 2010-06-28 19:39:18 +0200 (Mon, 28 Jun 2010) | 1 line
fixed #3604
........
r22544 | michelou | 2010-07-12 17:57:40 +0200 (Mon, 12 Jul 2010) | 2 lines
removed generics warnings in actors
........
r22630 | michelou | 2010-07-26 16:27:41 +0200 (Mon, 26 Jul 2010) | 2 lines
fixed case 2 (Android) in ticket #2464 (case 1 is ok with 2.8.0.final)
........ r22698 | michelou | 2010-08-07 11:25:42 +0200 (Sat, 07 Aug
2010) | 2 lines
fixed t3738
........
r22724 | odersky | 2010-08-10 17:57:43 +0200 (Tue, 10 Aug 2010) | 1 line
Fixes #3728. No review.
........
r22791 | odersky | 2010-08-18 19:12:44 +0200 (Wed, 18 Aug 2010) | 1 line
Closes #3756. No review.
........
r22792 | odersky | 2010-08-18 19:47:04 +0200 (Wed, 18 Aug 2010) | 1 line
Closes #3763. No review.
........
Diffstat (limited to 'src/library')
| -rw-r--r-- | src/library/scala/collection/MapLike.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/library/scala/collection/MapLike.scala b/src/library/scala/collection/MapLike.scala index fdaee64fd5..ebf95dde81 100644 --- a/src/library/scala/collection/MapLike.scala +++ b/src/library/scala/collection/MapLike.scala @@ -283,7 +283,7 @@ self => * @param kvs the collection containing the added key/value pairs * @tparam B1 the type of the added values * @return a new map with the given bindings added to this map - * @usecase def + (kvs: Traversable[(A, B)]): Map[A, B] + * @usecase def ++ (xs: Traversable[(A, B)]): Map[A, B] */ def ++[B1 >: B](xs: TraversableOnce[(A, B1)]): Map[A, B1] = ((repr: Map[A, B1]) /: xs) (_ + _) |