Merge branch 'master' into dsl
authorMaxim Medvedev <maxim.medvedev@jetbrains.com>
Tue, 3 Aug 2010 11:04:42 +0000 (15:04 +0400)
committerMaxim Medvedev <maxim.medvedev@jetbrains.com>
Tue, 3 Aug 2010 11:04:42 +0000 (15:04 +0400)
commite37f30cd79e69566d1beb1ffc2bd5a3d91ab1db8
treea2030c25c4256d643338ee083a7734cc4a9baa03
parent07c1bcda8d9d6718dd408285010ffa3ceb937060
parentb79ad325361d1f11b1567d81f052599d2a4adb4a
Merge branch 'master' into dsl

Conflicts:
plugins/groovy/resources/standardDsls/newifyTransform.gdsl
plugins/groovy/resources/standardDsls/metaDsl.gdsl
plugins/groovy/resources/standardDsls/newifyTransform.gdsl
plugins/groovy/src/META-INF/plugin.xml
plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/GroovyAnnotator.java
plugins/groovy/src/org/jetbrains/plugins/groovy/dsl/holders/NonCodeMembersHolder.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/ResolveUtil.java