Merge branch 'master' into changeSignature
authorMaxim Medvedev <maxim.medvedev@jetbrains.com>
Wed, 28 Apr 2010 12:00:32 +0000 (16:00 +0400)
committerMaxim Medvedev <maxim.medvedev@jetbrains.com>
Wed, 28 Apr 2010 12:00:32 +0000 (16:00 +0400)
commita32ed428c17c55eb79bca316cfbc54ebb61de0e8
tree5839bbdcd449f2aade99a4c45ff33d35e886dcdb
parent63662c28a75f3a22e701e20a3a1b34d874ab5e91
parent995598ab600c318c33f6de8b35f6b4d513a1bd10
Merge branch 'master' into changeSignature

Conflicts:
java/java-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureProcessor.java
java/java-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureProcessor.java
platform/lang-api/src/com/intellij/psi/impl/ElementBase.java
platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorTabbedContainer.java
plugins/groovy/src/META-INF/plugin.xml
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/arguments/GrArgumentLabelImpl.java
resources/src/META-INF/IdeaPlugin.xml