Merge branch 'master' into no-reformat-dialog-on-reformat-code-action
authorYaroslav Lepenkin <yaroslav.lepenkin@jetbrains.com>
Wed, 11 Feb 2015 12:07:55 +0000 (15:07 +0300)
committerYaroslav Lepenkin <yaroslav.lepenkin@jetbrains.com>
Wed, 11 Feb 2015 12:07:55 +0000 (15:07 +0300)
commit7c720b5b7545920d6e9f3a3680f2b93118bf64a4
tree51737cbac0fbe2af4a5cc9922db3fd5ccd29a298
parent2674b07b8043a7e8817942c3b8016e4551cc12e5
parent013314cfbc0d4dabb887597e92cda2c2d0b8704b
Merge branch 'master' into no-reformat-dialog-on-reformat-code-action

Conflicts:
platform/lang-impl/src/com/intellij/codeInsight/actions/AbstractLayoutCodeProcessor.java
java/java-tests/testSrc/com/intellij/codeInsight/actions/AbstractLayoutCodeProcessorTest.java
java/java-tests/testSrc/com/intellij/codeInsight/actions/ReformatCodeActionTest.java
platform/lang-impl/src/com/intellij/codeInsight/actions/AbstractLayoutCodeProcessor.java
platform/lang-impl/src/com/intellij/codeInsight/actions/OptimizeImportsAction.java
platform/lang-impl/src/com/intellij/codeInsight/actions/ReformatCodeAction.java
platform/platform-resources/src/idea/Keymap_Default.xml
platform/platform-resources/src/idea/LangActions.xml