Merge branch 'master' into codeStyleExtractor
authorjamesbrain <marso.des@gmail.com>
Thu, 1 Oct 2015 10:48:14 +0000 (13:48 +0300)
committerjamesbrain <marso.des@gmail.com>
Thu, 1 Oct 2015 10:48:14 +0000 (13:48 +0300)
1  2 
platform/lang-impl/src/com/intellij/application/options/codeStyle/OptionTableWithPreviewPanel.java
platform/platform-resources/src/META-INF/LangExtensionPoints.xml
platform/platform-resources/src/idea/LangActions.xml
resources/src/META-INF/IdeaPlugin.xml

Simple merge