Natalia.Ukhorskaya 372ea911a5 Merge branch 'master' into idea13 ...

Conflicts:
	idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionToSupertypeFix.java
	idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionReturnTypeFix.java
	libraries/stdlib/src/kotlin/properties/Properties.kt
	libraries/stdlib/test/properties/delegation/DelegationTest.kt
	libraries/stdlib/test/properties/delegation/MapDelegationTest.kt
	libraries/stdlib/test/properties/delegation/lazy/LazyValuesTest.kt
	update_dependencies.xml

Original commit: 8429162220

2013-06-04 13:14:08 +04:00

jps/jps-plugin

Support custom JDK annotations path for TeamCity

2013-05-31 20:35:32 +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%