--- a/carbidesdk/com.nokia.carbide.cpp.sdk-feature/build.properties	Thu Sep 24 08:00:35 2009 -0500
+++ b/carbidesdk/com.nokia.carbide.cpp.sdk-feature/build.properties	Tue Sep 29 14:27:30 2009 -0500
@@ -1,3 +1,11 @@
 bin.includes = feature.xml,\
                Carbide_Image.png,\
                license.txt
+generate.feature@com.nokia.carbide.bugreport.source=com.nokia.carbide.bugreport
+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

--- a/carbidesdk/com.nokia.carbide.cpp.sdk-feature/feature.xml	Thu Sep 24 08:00:35 2009 -0500
+++ b/carbidesdk/com.nokia.carbide.cpp.sdk-feature/feature.xml	Tue Sep 29 14:27:30 2009 -0500
@@ -331,5 +331,15 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-
+         
+         
+    <includes id="com.nokia.carbide.bugreport.source" version="0.0.0"/>
+    <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"/>    
+    
 </feature>

--- a/core/com.nokia.carbide.bugreport-feature/build.properties	Thu Sep 24 08:00:35 2009 -0500
+++ b/core/com.nokia.carbide.bugreport-feature/build.properties	Tue Sep 29 14:27:30 2009 -0500
@@ -2,4 +2,3 @@
                Carbide_Image.png,\
                license.txt,\
                feature.properties            
-generate.feature@com.nokia.carbide.bugreport.source=com.nokia.carbide.bugreport
\ No newline at end of file

--- a/core/com.nokia.carbide.bugreport-feature/feature.xml	Thu Sep 24 08:00:35 2009 -0500
+++ b/core/com.nokia.carbide.bugreport-feature/feature.xml	Tue Sep 29 14:27:30 2009 -0500
@@ -338,8 +338,5 @@
          version="0.0.0"
          unpack="false"/>
 
-  <includes
-         id="com.nokia.carbide.bugreport.source"
-         version="0.0.0"/>
 
 </feature>

--- a/core/com.nokia.carbide.cpp-feature/build.properties	Thu Sep 24 08:00:35 2009 -0500
+++ b/core/com.nokia.carbide.cpp-feature/build.properties	Tue Sep 29 14:27:30 2009 -0500
@@ -2,4 +2,3 @@
                Carbide_Image.png,\
                license.txt,\
                feature.properties            
-generate.feature@com.nokia.carbide.cpp.source=com.nokia.carbide.cpp
\ No newline at end of file

--- a/core/com.nokia.carbide.cpp-feature/feature.xml	Thu Sep 24 08:00:35 2009 -0500
+++ b/core/com.nokia.carbide.cpp-feature/feature.xml	Tue Sep 29 14:27:30 2009 -0500
@@ -2,7 +2,7 @@
 <feature
       id="com.nokia.carbide.cpp"
       label="%featureName"
-      version="3.0.0.qualifier"
+      version="2.3.0.qualifier"
       provider-name="Nokia"
       plugin="com.nokia.carbide.cpp"
       image="Carbide_Image.png">
@@ -314,8 +314,8 @@
 
    <url>
       <!-- all Carbide.c++ features should use the exact same text for update label and discovery label -->
-      <update label="Carbide.c++ 3.0 Update Site" url="http://tools.ext.nokia.com/updates/carbide30"/>
-      <discovery label="Carbide.c++ 3.0 Update Site" url="http://tools.ext.nokia.com/updates/carbide30"/>
+      <update label="Carbide.c++ Update Site" url="http://tools.ext.nokia.com/updates/carbide22"/>
+      <discovery label="Carbide.c++ Update Site" url="http://tools.ext.nokia.com/updates/carbide22"/>
    </url>
 
    <requires>
@@ -680,8 +680,6 @@
          version="0.0.0"
          unpack="false"/>
 
-  <includes
-         id="com.nokia.carbide.cpp.source"
-         version="0.0.0"/>
+
 
 </feature>

--- a/core/com.nokia.carbide.cpp.codescanner-feature/build.properties	Thu Sep 24 08:00:35 2009 -0500
+++ b/core/com.nokia.carbide.cpp.codescanner-feature/build.properties	Tue Sep 29 14:27:30 2009 -0500
@@ -2,4 +2,3 @@
                Carbide_Image.png,\
                license.txt,\
                feature.properties           
-generate.feature@com.nokia.carbide.cpp.codescanner.source=com.nokia.carbide.cpp.codescanner
\ No newline at end of file

--- a/core/com.nokia.carbide.cpp.codescanner-feature/feature.xml	Thu Sep 24 08:00:35 2009 -0500
+++ b/core/com.nokia.carbide.cpp.codescanner-feature/feature.xml	Tue Sep 29 14:27:30 2009 -0500
@@ -318,9 +318,6 @@
       <discovery label="Carbide.c++ Update Site" url="http://tools.ext.nokia.com/updates/carbide203"/>
    </url>
 
-   <includes
-         id="com.nokia.carbide.cpp.codescanner.source"
-         version="0.0.0"/>
 
    <plugin
          id="com.nokia.carbide.cpp.codescanner"

--- a/core/com.nokia.carbide.search.system-feature/build.properties	Thu Sep 24 08:00:35 2009 -0500
+++ b/core/com.nokia.carbide.search.system-feature/build.properties	Tue Sep 29 14:27:30 2009 -0500
@@ -2,4 +2,3 @@
                Carbide_Image.png,\
                license.txt,\
                feature.properties             
-generate.feature@com.nokia.carbide.search.system.source=com.nokia.carbide.search.system
\ No newline at end of file

--- a/core/com.nokia.carbide.search.system-feature/feature.xml	Thu Sep 24 08:00:35 2009 -0500
+++ b/core/com.nokia.carbide.search.system-feature/feature.xml	Tue Sep 29 14:27:30 2009 -0500
@@ -318,9 +318,7 @@
       <discovery label="Carbide.c++ Update Site" url="http://tools.ext.nokia.com/updates/carbide203"/>
    </url>
 
-   <includes
-         id="com.nokia.carbide.search.system.source"
-         version="0.0.0"/>
+
 
    <requires>
       <import plugin="org.eclipse.core.runtime"/>

--- a/uidesigner/com.nokia.carbide.cpp.uiq.ui-feature/build.properties	Thu Sep 24 08:00:35 2009 -0500
+++ b/uidesigner/com.nokia.carbide.cpp.uiq.ui-feature/build.properties	Tue Sep 29 14:27:30 2009 -0500
@@ -2,4 +2,3 @@
                Carbide_Image.png,\
                license.txt,\
 	       feature.properties
-generate.feature@com.nokia.carbide.cpp.uiq.ui.source=com.nokia.carbide.cpp.uiq.ui
\ No newline at end of file

--- a/uidesigner/com.nokia.carbide.cpp.uiq.ui-feature/feature.xml	Thu Sep 24 08:00:35 2009 -0500
+++ b/uidesigner/com.nokia.carbide.cpp.uiq.ui-feature/feature.xml	Tue Sep 29 14:27:30 2009 -0500
@@ -347,8 +347,5 @@
          version="0.0.0"
          unpack="false"/>
          
- 	<includes
-         id="com.nokia.carbide.cpp.uiq.ui.source"
-         version="0.0.0"/>
 
 </feature>

--- a/uidesigner/com.nokia.sdt.uidesigner-feature/build.properties	Thu Sep 24 08:00:35 2009 -0500
+++ b/uidesigner/com.nokia.sdt.uidesigner-feature/build.properties	Tue Sep 29 14:27:30 2009 -0500
@@ -2,4 +2,3 @@
                Carbide_Image.png,\
                license.txt,\
 	       feature.properties
-generate.feature@com.nokia.sdt.uidesigner.source=com.nokia.sdt.uidesigner
\ No newline at end of file

--- a/uidesigner/com.nokia.sdt.uidesigner-feature/feature.xml	Thu Sep 24 08:00:35 2009 -0500
+++ b/uidesigner/com.nokia.sdt.uidesigner-feature/feature.xml	Tue Sep 29 14:27:30 2009 -0500
@@ -395,8 +395,6 @@
          version="0.0.0"
          unpack="false"/>
 
- 	<includes
-         id="com.nokia.sdt.uidesigner.source"
-         version="0.0.0"/>
+
 
 </feature>