Merge branch 'psicore' pycharm/108.400
authorDmitry Jemerov <yole@jetbrains.com>
Sun, 5 Jun 2011 10:51:48 +0000 (12:51 +0200)
committerDmitry Jemerov <yole@jetbrains.com>
Sun, 5 Jun 2011 10:51:48 +0000 (12:51 +0200)
1  2 
platform/lang-impl/src/com/intellij/application/options/codeStyle/MultilanguageCodeStyleAbstractPanel.java
platform/platform-resources/src/META-INF/PlatformExtensionPoints.xml