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

jps/jps-plugin

Merge master into idea14

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

S

Description

The Kotlin Programming Language.

2.1 GiB

Languages

Kotlin 79.9%

Java 10.4%

Swift 4.3%

C 2.8%

C++ 2.1%

Other 0.3%