summaryrefslogtreecommitdiff
path: root/test/files/run/concurrent-map-conversions.scala
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into feature/collection-concurrentAleksandar Prokopec2012-04-021-0/+36
Conflicts: src/library/scala/collection/JavaConversions.scala src/library/scala/collection/JavaConverters.scala Add one test for concurrent map conversion.