# HG changeset patch
# User dadubrow
# Date 1278534060 18000
# Node ID c832c22002bc1000c253d0684f17b2d58e5275f2
# Parent  e909ab661a7aa13f28a2d4298ed7ef616cdb1f9e
merge

diff -r e909ab661a7a -r c832c22002bc 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 15:19:51 2010 -0500
+++ b/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/discovery/ui/view/DiscoveryView.java	Wed Jul 07 15:21:00 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 e909ab661a7a -r c832c22002bc debuggercdi/com.nokia.carbide.cpp.debug.capabilities/plugin.xml
--- a/debuggercdi/com.nokia.carbide.cpp.debug.capabilities/plugin.xml	Wed Jul 07 15:19:51 2010 -0500
+++ b/debuggercdi/com.nokia.carbide.cpp.debug.capabilities/plugin.xml	Wed Jul 07 15:21:00 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"