# HG changeset patch
# User timkelly
# Date 1260154027 21600
# Node ID 20fd716f8eaaa776662160c117a033e32aa8d156
# Parent  1f0a706d24b2a50e148e2356109d50a4f30d8cc1# Parent  5ff506b20613a63673dc1a5c28a04ee47474c2be
merge commit

diff -r 5ff506b20613 -r 20fd716f8eaa qt/com.nokia.carbide.cpp.qt.core/META-INF/MANIFEST.MF
--- 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