Merge remote branch 'origin/master'

Conflicts: compiler/frontend/src/org/jetbrains/jet/lang/types/JetTypeInferrer.java
2011-10-13 17:55:59 +04:00
parent 97756531db e32409e4bf
commit 60ffd63a8e
79 changed files with 2607 additions and 505 deletions
@@ -136,9 +136,9 @@ fun tf() : Int {
 }

 fun failtest(a : Int) : Int {
-  <error>if (fail() || true) {
+  if (fail() || <error>true</error>) {

-  }</error>
+  }
  <error>return 1</error>
 }