Merge remote branch 'origin/master'

2012-07-30 13:25:19 +03:00
parent a98cd7aa0f 36e0da0c29
commit 4685679eaf
3 changed files with 17 additions and 1 deletions
@@ -68,4 +68,8 @@ public class TraitsTest extends CodegenTestCase {
    public void testKt2541() {
        blackBoxFile("regressions/kt2541.kt");
    }
+
+    public void testFinalMethod() throws Exception {
+        blackBoxFile("traits/finalMethod.jet");
+    }
 }