merge commit
authortimkelly
Sun, 06 Dec 2009 20:47:07 -0600
changeset 642 20fd716f8eaa
parent 641 1f0a706d24b2 (diff)
parent 640 5ff506b20613 (current diff)
child 643 421b1531a135
merge commit
--- a/qt/com.nokia.carbide.cpp.qt.core/META-INF/MANIFEST.MF	Fri Dec 04 16:32:30 2009 -0600
+++ b/qt/com.nokia.carbide.cpp.qt.core/META-INF/MANIFEST.MF	Sun Dec 06 20:47:07 2009 -0600
@@ -11,7 +11,7 @@
  org.eclipse.jface,
  com.nokia.carbide.cpp.sdk.core,
  com.nokia.carbide.cpp.sdk.ui,
- com.trolltech.qtcppproject;bundle-version="1.5.0";resolution:=optional
+ com.trolltech.qtcppproject;bundle-version="1.6.0";resolution:=optional
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
 Export-Package: com.nokia.carbide.cpp.internal.qt.core