merge commit
authortimkelly
Tue, 16 Feb 2010 14:02:57 -0600
changeset 971 1273779334ba
parent 970 703d52f84950 (diff)
parent 969 b0dd389735fb (current diff)
child 972 0c49ca7fe877
merge commit
--- a/qt/com.nokia.carbide.cpp.qt.core/build.properties	Tue Feb 16 13:44:54 2010 -0600
+++ b/qt/com.nokia.carbide.cpp.qt.core/build.properties	Tue Feb 16 14:02:57 2010 -0600
@@ -1,4 +1,2 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .
+bin.includes = plugin.xml,\
+               META-INF/