# HG changeset patch
# User dadubrow
# Date 1278534145 18000
# Node ID 09779f4a10b3c6af2e85a7621c2eb21062c53945
# Parent  c832c22002bc1000c253d0684f17b2d58e5275f2# Parent  39ba239eeb5cab8e147f4a1f60f8a24bff514835
merge

diff -r 39ba239eeb5c -r 09779f4a10b3 connectivity/com.nokia.carbide.remoteConnections.tests/plugin.xml
--- a/connectivity/com.nokia.carbide.remoteConnections.tests/plugin.xml	Wed Jul 07 14:03:56 2010 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections.tests/plugin.xml	Wed Jul 07 15:22:25 2010 -0500
@@ -26,26 +26,6 @@
       </service>
    </extension>
    <extension
-         point="org.eclipse.ui.actionSets">
-      <actionSet
-            id="com.nokia.carbide.remoteconnections.tests.extensions.actionSet"
-            label="Service Dialogs"
-            visible="true">
-         <action
-               class="com.nokia.carbide.remoteconnections.tests.extensions.RandomCycleServiceDialogAction"
-               id="com.nokia.carbide.remoteconnections.tests.randomCycle.action"
-               label="Random Cycle Service Dialog..."
-               menubarPath="help/TestServiceDialogs">
-         </action>
-         <action
-               class="com.nokia.carbide.remoteconnections.tests.extensions.UnknownStatusServiceDialogAction"
-               id="com.nokia.carbide.remoteconnections.tests.unknownStatus.action"
-               label="Unknown Status Service Dialog..."
-               menubarPath="help/TestServiceDialogs">
-         </action>
-      </actionSet>
-   </extension>
-   <extension
          point="com.nokia.carbide.remoteConnections.extensionFilter">
       <extensionFilter
             class="com.nokia.carbide.remoteconnections.tests.extensions.TestFilter">
diff -r 39ba239eeb5c -r 09779f4a10b3 core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/discovery/ui/view/DiscoveryView.java
--- a/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/discovery/ui/view/DiscoveryView.java	Wed Jul 07 14:03:56 2010 -0500
+++ b/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/discovery/ui/view/DiscoveryView.java	Wed Jul 07 15:22:25 2010 -0500
@@ -25,7 +25,6 @@
 import org.eclipse.equinox.internal.p2.discovery.compatibility.RemoteBundleDiscoveryStrategy;
 import org.eclipse.equinox.internal.p2.discovery.model.CatalogItem;
 import org.eclipse.equinox.internal.p2.ui.discovery.DiscoveryUi;
-import org.eclipse.equinox.internal.p2.ui.discovery.util.WorkbenchUtil;
 import org.eclipse.equinox.internal.p2.ui.discovery.wizards.CatalogConfiguration;
 import org.eclipse.equinox.internal.p2.ui.discovery.wizards.CatalogViewer;
 import org.eclipse.equinox.p2.core.IProvisioningAgent;
diff -r 39ba239eeb5c -r 09779f4a10b3 debuggercdi/com.nokia.carbide.cpp.debug.capabilities/plugin.xml
--- a/debuggercdi/com.nokia.carbide.cpp.debug.capabilities/plugin.xml	Wed Jul 07 14:03:56 2010 -0500
+++ b/debuggercdi/com.nokia.carbide.cpp.debug.capabilities/plugin.xml	Wed Jul 07 15:22:25 2010 -0500
@@ -394,6 +394,10 @@
             activityId="org.eclipse.cdt.ui.activityResourceConfigurations"
             pattern="org.eclipse.cdt.ui/org.eclipse.cdt.ui.buildConfigContributionM">
       </activityPatternBinding>
+      <activityPatternBinding
+            activityId="org.eclipse.cdt.ui.activityResourceConfigurations"
+            pattern="Preferences.ContextAction">
+      </activityPatternBinding>
 <!-- Import Executable action -->      
       <activity
             name="CDT - C/C++ Import Executable Wizard"