merge 2 heads on default branch
authorcawthron
Fri, 03 Apr 2009 13:52:12 -0500
changeset 38 56290df01690
parent 37 c8c1c19ac103 (current diff)
parent 31 ef1e2407cb7a (diff)
child 40 0ca05f80360c
merge 2 heads on default branch
--- 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">
--- 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