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

Original commit: a0e45e9a12

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

..

general

Test package facade recompile after removing several files

2014-06-20 17:19:46 +04:00

incremental

Added tests with class referenced from proto.

2014-06-24 22:18:19 +04:00