# HG changeset patch
# User wpaul
# Date 1278944567 18000
# Node ID da256abf7b0a0d6f4e0231626ff9a80fa0a2ca0c
# Parent  c72b1d908826ad528e7e5049da326baa27798f21# Parent  ba5f9ad4d844a16ed0fff0706321ad5eedad2a73
erged

diff -r c72b1d908826 -r da256abf7b0a carbidesdk/com.nokia.carbide.cpp.sdk-feature/build.properties
--- a/carbidesdk/com.nokia.carbide.cpp.sdk-feature/build.properties	Fri Jul 09 16:42:26 2010 -0500
+++ b/carbidesdk/com.nokia.carbide.cpp.sdk-feature/build.properties	Mon Jul 12 09:22:47 2010 -0500
@@ -5,7 +5,6 @@
 generate.feature@com.nokia.carbide.cpp.capabilityScanner.source=com.nokia.carbide.cpp.capabilityScanner
 generate.feature@com.nokia.carbide.cpp.codescanner.source=com.nokia.carbide.cpp.codescanner
 generate.feature@com.nokia.carbide.cpp.pi.source=com.nokia.carbide.cpp.pi
-generate.feature@com.nokia.carbide.cpp.uiq.ui.source=com.nokia.carbide.cpp.uiq.ui
 generate.feature@com.nokia.carbide.cpp.source=com.nokia.carbide.cpp
 generate.feature@com.nokia.carbide.search.system.source=com.nokia.carbide.search.system
 generate.feature@com.nokia.sdt.uidesigner.source=com.nokia.sdt.uidesigner
\ No newline at end of file
diff -r c72b1d908826 -r da256abf7b0a carbidesdk/com.nokia.carbide.cpp.sdk-feature/feature.xml
--- a/carbidesdk/com.nokia.carbide.cpp.sdk-feature/feature.xml	Fri Jul 09 16:42:26 2010 -0500
+++ b/carbidesdk/com.nokia.carbide.cpp.sdk-feature/feature.xml	Mon Jul 12 09:22:47 2010 -0500
@@ -337,7 +337,6 @@
     <includes id="com.nokia.carbide.cpp.capabilityScanner.source" version="0.0.0"/>
     <includes id="com.nokia.carbide.cpp.codescanner.source" version="0.0.0"/>
  	<includes id="com.nokia.carbide.cpp.pi.source" version="0.0.0"/>
- 	<includes id="com.nokia.carbide.cpp.uiq.ui.source" version="0.0.0"/>
     <includes id="com.nokia.carbide.cpp.source" version="0.0.0"/>
     <includes id="com.nokia.carbide.search.system.source" version="0.0.0"/>
  	<includes id="com.nokia.sdt.uidesigner.source" version="0.0.0"/>