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

..

resources

Added ConvertToConcatenatedStringIntention

2014-05-23 16:27:46 +04:00

src

Merge master into idea14

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

testData

Formatting: Move '}' to next line in when

2014-06-25 14:22:55 +04:00

tests/org/jetbrains/jet

Merge master into idea14

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

idea.iml

Add module eval4j

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