Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--changelog/org.eclipse.linuxtools.changelog.core/ChangeLog6
-rw-r--r--changelog/org.eclipse.linuxtools.changelog.core/plugin.xml10
2 files changed, 6 insertions, 10 deletions
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/ChangeLog b/changelog/org.eclipse.linuxtools.changelog.core/ChangeLog
index 3bc1f00515..806309c98b 100644
--- a/changelog/org.eclipse.linuxtools.changelog.core/ChangeLog
+++ b/changelog/org.eclipse.linuxtools.changelog.core/ChangeLog
@@ -1,3 +1,9 @@
+2011-04-01 Jeff Johnston <jjohnstn@redhat.com>
+
+ Bug #341534
+ * plugin.xml: Fix conflict with CTRL+ALT+P within the ChangeLog plug-in
+ itself.
+
2011-01-27 Jeff Johnston <jjohnstn@redhat.com>
Bug #332621
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/plugin.xml b/changelog/org.eclipse.linuxtools.changelog.core/plugin.xml
index 1827afba75..34e995b17e 100644
--- a/changelog/org.eclipse.linuxtools.changelog.core/plugin.xml
+++ b/changelog/org.eclipse.linuxtools.changelog.core/plugin.xml
@@ -189,16 +189,6 @@
id="org.eclipse.linuxtools.changelog.keyscheme.default"
name="default"/>
<key
- commandId="org.eclipse.linuxtools.changelog.core.preparechangelog2"
- contextId="org.eclipse.ui.textEditorScope"
- schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
- sequence="Ctrl+Alt+P" />
- <key
- commandId="org.eclipse.linuxtools.changelog.core.preparechangelog2"
- contextId="org.eclipse.compare.compareEditorScope"
- schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
- sequence="Ctrl+Alt+P"/>
- <key
commandId="org.eclipse.linuxtools.changelog.core.preparechangelog"
contextId="org.eclipse.ui.contexts.window"
schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"

Back to the top