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)
commit02f95454805b98550a9a28bdaa677ad18d74f399
tree63d0c4bfffd6dc940c1a98d897efd8317066d89c
parentc92e000ebb15997377e38729043464fa7de94b97
parentebf7eb88e3be040bde0280ddf3c410a1990ef63c
Merge branch 'master' into codeStyleExtractor
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