Merge branch 'master' into changeSignature
authorMaxim Medvedev <maxim.medvedev@jetbrains.com>
Tue, 11 May 2010 10:36:06 +0000 (14:36 +0400)
committerMaxim Medvedev <maxim.medvedev@jetbrains.com>
Tue, 11 May 2010 10:36:06 +0000 (14:36 +0400)
commit5d692db484fe17cf5e2b622ab58d866969e190d5
treefe313232059ce6cb00f5b30895c4d3ae3c5dc1fb
parent298b36095ec67e5c6e49af6f0962859ddfb78d49
parentd0511cedb612929eccf59b3c1087153b6d4a29d1
Merge branch 'master' into changeSignature
platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleImpl.java
plugins/groovy/src/META-INF/plugin.xml
plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/GroovyAnnotator.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/arguments/GrArgumentLabelImpl.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/types/GrClosureSignatureUtil.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/util/PsiUtil.java