diff options
author | Tomasz Zarna | 2012-04-17 15:12:06 +0000 |
---|---|---|
committer | Tomasz Zarna | 2012-04-17 15:15:09 +0000 |
commit | 4981966662e63b6fe5bef93129b4dd28ef1ac941 (patch) | |
tree | 90ea28401259ac11e419251ada53488a02d030b3 | |
parent | 70099ad7135f3225156b2d86de532d335d4874d8 (diff) | |
download | eclipse.platform.team-4981966662e63b6fe5bef93129b4dd28ef1ac941.tar.gz eclipse.platform.team-4981966662e63b6fe5bef93129b4dd28ef1ac941.tar.xz eclipse.platform.team-4981966662e63b6fe5bef93129b4dd28ef1ac941.zip |
bug 366513: [docs] Pressing F1 does not reveal docs for "Replace withv20120417-1515
Local History" context-menu action in the package explorer
-rw-r--r-- | bundles/org.eclipse.compare/plugin.xml | 11 | ||||
-rw-r--r-- | bundles/org.eclipse.team.ui/plugin.xml | 5 |
2 files changed, 9 insertions, 7 deletions
diff --git a/bundles/org.eclipse.compare/plugin.xml b/bundles/org.eclipse.compare/plugin.xml index 63ae78afe..751f46aef 100644 --- a/bundles/org.eclipse.compare/plugin.xml +++ b/bundles/org.eclipse.compare/plugin.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <?eclipse version="3.0"?> <!-- - Copyright (c) 2001, 2011 IBM Corporation and others. + Copyright (c) 2001, 2012 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at @@ -233,12 +233,13 @@ </separator> </menu> <action - label="%ReplaceFromHistoryAction.label" - tooltip="%ReplaceFromHistoryAction.tooltip" class="org.eclipse.compare.internal.ReplaceWithEditionAction" - menubarPath="replaceWithMenu/replaceWithGroup" enablesFor="1" - id="replaceFromHistory"> + helpContextId="org.eclipse.compare.replace_with_edition_action_context" + id="replaceFromHistory" + label="%ReplaceFromHistoryAction.label" + menubarPath="replaceWithMenu/replaceWithGroup" + tooltip="%ReplaceFromHistoryAction.tooltip"> </action> <action label="%ReplaceWithPreviousFromHistoryAction.label" diff --git a/bundles/org.eclipse.team.ui/plugin.xml b/bundles/org.eclipse.team.ui/plugin.xml index baa57778b..00ac35084 100644 --- a/bundles/org.eclipse.team.ui/plugin.xml +++ b/bundles/org.eclipse.team.ui/plugin.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <?eclipse version="3.0"?> <!-- - Copyright (c) 2001, 2011 IBM Corporation and others. + Copyright (c) 2001, 2012 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at @@ -167,10 +167,11 @@ tooltip="%CompareLocalHistory.tooltip"/> <action class="org.eclipse.team.internal.ui.history.ReplaceLocalHistory" + enablesFor="1" + helpContextId="org.eclipse.compare.replace_with_edition_action_context" id="org.eclipse.team.ui.replaceLocalHistory" label="%ReplaceLocalHistory.label" menubarPath="replaceWithMenu/replaceWithGroup" - enablesFor="1" overrideActionId="replaceFromHistory" tooltip="%ReplaceLocalHistory.tooltip"/> <action |