diff options
author | Aleksandar Prokopec <axel22@gmail.com> | 2012-04-02 13:16:09 +0200 |
---|---|---|
committer | Aleksandar Prokopec <axel22@gmail.com> | 2012-04-02 13:16:09 +0200 |
commit | de3bd754676fbed0b6c69ca3d676b72bc276e925 (patch) | |
tree | 1d18a7f8c193fda503d63d286ddcf561842d1091 /test/pending/run/t5629.check | |
parent | c14766c1affe968788c77fea45ae042d71038472 (diff) | |
parent | f7535f72903f083b2444fb1d0b73363efa5482e9 (diff) | |
download | scala-de3bd754676fbed0b6c69ca3d676b72bc276e925.tar.gz scala-de3bd754676fbed0b6c69ca3d676b72bc276e925.tar.bz2 scala-de3bd754676fbed0b6c69ca3d676b72bc276e925.zip |
Merge branch 'master' into feature/collection-concurrent
Conflicts:
src/library/scala/collection/JavaConversions.scala
src/library/scala/collection/JavaConverters.scala
Add one test for concurrent map conversion.
Diffstat (limited to 'test/pending/run/t5629.check')
-rw-r--r-- | test/pending/run/t5629.check | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/test/pending/run/t5629.check b/test/pending/run/t5629.check new file mode 100644 index 0000000000..6a2d630f4e --- /dev/null +++ b/test/pending/run/t5629.check @@ -0,0 +1,2 @@ +int child got: 33 +any child got: 33 |