Merge branch 'dany/groovy-transformations'
authorDaniil Ovchinnikov <daniil.ovchinnikov@jetbrains.com>
Tue, 3 May 2016 17:34:02 +0000 (20:34 +0300)
committerDaniil Ovchinnikov <daniil.ovchinnikov@jetbrains.com>
Tue, 3 May 2016 17:34:02 +0000 (20:34 +0300)
commitd18465694a1a3555a52db7374b0fed3f16f11262
treecc248ff2a342bc23b2ccba7022441b3f81a01d57
parent37d96dfedca473bd4f00533bc3c94d63a2d1f825
parent414c3a5f3ae99eb89e64640f5f9888558aad06b5
Merge branch 'dany/groovy-transformations'

# Conflicts:
# plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/util/GrClassImplUtil.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/annotator/GroovyAnnotator.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/TypesUtil.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/util/GrClassImplUtil.java