Merge branch 'master' into configure-code-style-on-selected-fragment
authorYaroslav Lepenkin <yaroslav.lepenkin@jetbrains.com>
Tue, 24 Feb 2015 12:45:20 +0000 (15:45 +0300)
committerYaroslav Lepenkin <yaroslav.lepenkin@jetbrains.com>
Tue, 24 Feb 2015 12:45:20 +0000 (15:45 +0300)
1  2 
platform/lang-impl/src/com/intellij/application/options/codeStyle/OptionTableWithPreviewPanel.java
platform/lang-impl/src/com/intellij/application/options/codeStyle/OptionTreeWithPreviewPanel.java
platform/platform-api/src/com/intellij/ui/components/editors/JBComboBoxTableCellEditorComponent.java
platform/platform-resources/src/META-INF/LangExtensions.xml