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

..

kannotator-jps-plugin-test

Baby steps for incremental compilation.

2014-03-25 14:26:47 +04:00

src

Added exceptions for proguard: constants are used in JPS plugin.

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

test/org/jetbrains/jet/jps/build

Merge master into idea14

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

testData

Merge master into idea14

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

jps-plugin.iml

Extracted interface and moved implementation of IncrementalCache to jps-plugin, accessing cache via Java service loader.

2014-06-18 22:56:43 +04:00