merge master
authorMaxim Medvedev <maxim.medvedev@jetbrains.com>
Fri, 21 May 2010 13:39:25 +0000 (17:39 +0400)
committerMaxim Medvedev <maxim.medvedev@jetbrains.com>
Fri, 21 May 2010 13:39:25 +0000 (17:39 +0400)
commitb11b8c7b86b213bdef773d70b87894f8335826a1
tree5d173a35a4a9d8c8f391863aca8b500ba2c42283
parent0fe654cd9a75f8cb92ace7f1d10e7ccf0816bc80
parente99c82109807133860a0dfc55b771d73e736fed2
merge master
java/java-impl/src/com/intellij/psi/impl/source/codeStyle/JavaCodeStyleManagerImpl.java
java/java-tests/testSrc/com/intellij/refactoring/ChangeSignatureTest.java
platform/lvcs-impl/testSrc/com/intellij/historyIntegrTests/FileListeningTest.java
plugins/groovy/src/META-INF/plugin.xml
plugins/groovy/src/org/jetbrains/plugins/groovy/GroovyBundle.properties
plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/GroovyAnnotator.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyPsiElementFactoryImpl.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/members/GrMethodBaseImpl.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/util/PsiUtil.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenArtifact.java
resources/src/META-INF/IdeaPlugin.xml