Merge master into idea14

Conflicts: .idea/runConfigurations/All_Tests.xml idea/src/org/jetbrains/jet/plugin/conversion/copy/ConvertJavaCopyPastePostProcessor.kt idea/tests/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/AbstractJetExtractionTest.kt idea/tests/org/jetbrains/jet/shortenRefs/AbstractShortenRefsTest.kt
2014-06-25 16:26:01 +04:00
parent 3f2d65762b fd4aeb75fc
commit a0e45e9a12
978 changed files with 15161 additions and 4205 deletions
@@ -22,6 +22,7 @@
      <value defaultName="moduleWithDependencies" />
    </option>
    <envs>
+      <env name="kotlin.tests.actually.compile" value="true" />
      <env name="NO_FS_ROOTS_ACCESS_CHECK" value="true" />
    </envs>
    <patterns />