Merge branch 'master' into changeSignature

[idea/community.git] / resources / src / META-INF / IdeaPlugin.xml

diff --git a/resources/src/META-INF/IdeaPlugin.xml b/resources/src/META-INF/IdeaPlugin.xml
index 0a10fd7ead3206bf53e9a31badfbb6cf0785c3d6..5c73edf1d7938c86b73eec1fdbf5cd712f80fd40 100644 (file)
--- a/resources/src/META-INF/IdeaPlugin.xml
+++ b/resources/src/META-INF/IdeaPlugin.xml
@@ -171,7 +171,6 @@
     <xi:include href="/META-INF/PlatformExtensions.xml" xpointer="xpointer(/extensions/*)"/>
     <xi:include href="/META-INF/VcsExtensions.xml" xpointer="xpointer(/extensions/*)"/>
     <xi:include href="/META-INF/LangExtensions.xml" xpointer="xpointer(/extensions/*)"/>
-    <xi:include href="/META-INF/LocalHistoryExtensions.xml" xpointer="xpointer(/extensions/*)"/>
 
     <constantExpressionEvaluator language="JAVA" implementationClass="com.intellij.psi.impl.PsiExpressionEvaluator" />
     <annotationSupport language="JAVA" implementationClass="com.intellij.psi.impl.source.tree.java.JavaAnnotationSupport" />
@@ -625,11 +624,6 @@
 
     <!-- Resources -->
 
-    <!-- Local History -->
-    <!-- RubyMine includes a reduced version of this configurable: the days of keeping local history are specified
-         in the general settings -->
-    <applicationConfigurable implementation="com.intellij.history.integration.ui.views.LocalHistoryConfigurable"/>
-
     <!--TODO <applicationConfigurable implementation="com.intellij.ide.plugins.PluginManagerConfigurable"/>--> <!-- Plugins -->
     <!-- Intention Actions -->
     <!--TODO <applicationConfigurable implementation="com.intellij.openapi.updateSettings.impl.UpdateSettingsConfigurable"/>  --><!-- Updates -->