Nikolay Krasko a0e45e9a12 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

..

com

Merge master into idea14

2014-06-25 16:26:01 +04:00

org

Add annotations from eval4j

2014-04-23 18:09:33 +04:00