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
@@ -474,6 +474,16 @@
                        void stop();
                        void dispose();
                    }
+
+                    -keepclassmembers class org.jetbrains.org.objectweb.asm.Opcodes {
+                        *** ASM5;
+                    }
+
+                    -keepclassmembers class org.jetbrains.org.objectweb.asm.ClassReader {
+                        *** SKIP_CODE;
+                        *** SKIP_DEBUG;
+                        *** SKIP_FRAMES;
+                    }
                ]]></proguard>
            </else>
        </if>