# HG changeset patch
# User cawthron
# Date 1238784732 18000
# Node ID 56290df016906ce6ec3cd733de037cf4888afd5a
# Parent  c8c1c19ac10396b23ddc7058acf84bf056726e59# Parent  ef1e2407cb7a8440a3e5ad9c7d607e048abd5bf4
merge 2 heads on default branch

diff -r c8c1c19ac103 -r 56290df01690 core/com.nokia.carbide.cpp-feature/feature.xml
--- a/core/com.nokia.carbide.cpp-feature/feature.xml	Fri Apr 03 10:36:32 2009 -0500
+++ b/core/com.nokia.carbide.cpp-feature/feature.xml	Fri Apr 03 13:52:12 2009 -0500
@@ -2,7 +2,7 @@
 <feature
       id="com.nokia.carbide.cpp"
       label="%featureName"
-      version="2.0.3.qualifier"
+      version="2.1.0.qualifier"
       provider-name="Nokia"
       plugin="com.nokia.carbide.cpp"
       image="Carbide_Image.png">
diff -r c8c1c19ac103 -r 56290df01690 core/com.nokia.carbide.cpp/META-INF/MANIFEST.MF
--- a/core/com.nokia.carbide.cpp/META-INF/MANIFEST.MF	Fri Apr 03 10:36:32 2009 -0500
+++ b/core/com.nokia.carbide.cpp/META-INF/MANIFEST.MF	Fri Apr 03 13:52:12 2009 -0500
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Carbide.c++
 Bundle-SymbolicName: com.nokia.carbide.cpp; singleton:=true
-Bundle-Version: 2.0.3.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Activator: com.nokia.carbide.cpp.ProductPlugin
 Bundle-Vendor: Nokia
 Bundle-Localization: plugin