Merge branch 'master' of github.com:JetBrains/kotlin

2012-04-03 17:56:49 +01:00
parent 5155b858d7 638895dac7
commit e56b823c63
47 changed files with 116 additions and 159 deletions
@@ -410,7 +410,7 @@ class CollectionTest {
    class IterableWrapper<T>(collection : java.lang.Iterable<T>) : java.lang.Iterable<T> {
        private val collection = collection

-        override fun iterator(): java.util.Iterator<T> {
+        public override fun iterator(): java.util.Iterator<T> {
            return collection.iterator().sure()
        }
    }