# HG changeset patch
# User dan.podwall@nokia.com
# Date 1239044568 18000
# Node ID da820b19f9dabd1bfc1aaaea0ea312c5ad00fc5a
# Parent  9107fae37cee04fb02c2fa17e189aa371e50d3b6# Parent  0ca05f80360cb6852c83ba2a6965884244c9cc97
merge

diff -r 9107fae37cee -r da820b19f9da .branch.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.branch.txt	Mon Apr 06 14:02:48 2009 -0500
@@ -0,0 +1,1 @@
+default
diff -r 9107fae37cee -r da820b19f9da core/com.nokia.carbide.cpp-feature/feature.xml
--- a/core/com.nokia.carbide.cpp-feature/feature.xml	Mon Apr 06 14:00:50 2009 -0500
+++ b/core/com.nokia.carbide.cpp-feature/feature.xml	Mon Apr 06 14:02:48 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 9107fae37cee -r da820b19f9da core/com.nokia.carbide.cpp/META-INF/MANIFEST.MF
--- a/core/com.nokia.carbide.cpp/META-INF/MANIFEST.MF	Mon Apr 06 14:00:50 2009 -0500
+++ b/core/com.nokia.carbide.cpp/META-INF/MANIFEST.MF	Mon Apr 06 14:02:48 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