Nikolay Krasko 579bd6785e Merge remote-tracking branch 'origin/master' into idea-13-0 ...

Conflicts:
	compiler/testData/asJava/nullabilityAnnotations/Generic.java
	idea/src/META-INF/plugin.xml
	idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSRunnerUtils.java
	idea/testData/completion/basic/java/PropertyMetadata.kt
	update_dependencies.xml

2014-03-05 14:52:50 +04:00

..

_DefaultPackage.java

Always generate local variable table to preserve parameter names

2013-11-15 19:41:25 +04:00

_DefaultPackage.kt

Do not annotate private members and their parameters (to save space)

2013-11-11 17:20:15 +04:00

Class.java

Move jet.JetObject -> kotlin.jvm.internal.KObject

2014-03-02 19:54:58 +04:00

Class.kt

Generate @Nullable/@NotNull annotations on Kotlin declarations (for IDEA interop)

2013-11-11 17:20:15 +04:00

ClassObjectField.java

Move jet.JetObject -> kotlin.jvm.internal.KObject

2014-03-02 19:54:58 +04:00

ClassObjectField.kt

Annotate fields from traits' class object properties

2013-11-11 17:20:16 +04:00

ClassWithConstructor.java

Move jet.JetObject -> kotlin.jvm.internal.KObject

2014-03-02 19:54:58 +04:00

ClassWithConstructor.kt

Generate @Nullable/@NotNull annotations on Kotlin declarations (for IDEA interop)

2013-11-11 17:20:15 +04:00

ClassWithConstructorAndProperties.java

Move jet.JetObject -> kotlin.jvm.internal.KObject

2014-03-02 19:54:58 +04:00

ClassWithConstructorAndProperties.kt

Generate @Nullable/@NotNull annotations on Kotlin declarations (for IDEA interop)

2013-11-11 17:20:15 +04:00

Generic.java

Merge remote-tracking branch 'origin/master' into idea-13-0

2014-03-05 14:52:50 +04:00

Generic.kt

Do not annotate bare type parameters as @Nullable

2014-02-07 16:41:12 -08:00

Primitives.java

Move jet.JetObject -> kotlin.jvm.internal.KObject

2014-03-02 19:54:58 +04:00

Primitives.kt

Don't mark primitive types as @NotNull

2013-11-11 17:20:15 +04:00

PrivateInClass.java

Move jet.JetObject -> kotlin.jvm.internal.KObject

2014-03-02 19:54:58 +04:00

PrivateInClass.kt

Do not annotate private members and their parameters (to save space)

2013-11-11 17:20:15 +04:00

PrivateInTrait.java

Move jet.JetObject -> kotlin.jvm.internal.KObject

2014-03-02 19:54:58 +04:00

PrivateInTrait.kt

Do not annotate private members and their parameters (to save space)

2013-11-11 17:20:15 +04:00

Synthetic.java

Move jet.JetObject -> kotlin.jvm.internal.KObject

2014-03-02 19:54:58 +04:00

Synthetic.kt

visitAnnotation() could return null for light classes

2013-11-11 17:20:15 +04:00

Trait.java

Move jet.JetObject -> kotlin.jvm.internal.KObject

2014-03-02 19:54:58 +04:00

Trait.kt

Generate @Nullable/@NotNull annotations on Kotlin declarations (for IDEA interop)

2013-11-11 17:20:15 +04:00

TraitClassObjectField.java

Move jet.JetObject -> kotlin.jvm.internal.KObject

2014-03-02 19:54:58 +04:00

TraitClassObjectField.kt

Annotate fields from traits' class object properties

2013-11-11 17:20:16 +04:00