merge
authordan.podwall@nokia.com
Mon, 06 Apr 2009 14:02:48 -0500
changeset 51 da820b19f9da
parent 50 9107fae37cee (current diff)
parent 40 0ca05f80360c (diff)
child 54 ff58688cad6c
merge
--- /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
--- 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">
--- 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