# HG changeset patch
# User timkelly
# Date 1238000119 18000
# Node ID f330c1e8a4f31b436cbcfea734415740d6ae08f7
# Parent  2b2ec8fad47a1183ecfdc1ee038fad793d94968e# Parent  f5529458ffbaaaba441682215e64e2b1f6462574
commit the merge

diff -r f5529458ffba -r f330c1e8a4f3 uidesigner/com.nokia.carbide.cpp.uiq.ui-feature/build.properties
--- a/uidesigner/com.nokia.carbide.cpp.uiq.ui-feature/build.properties	Wed Mar 25 10:19:20 2009 -0500
+++ b/uidesigner/com.nokia.carbide.cpp.uiq.ui-feature/build.properties	Wed Mar 25 11:55:19 2009 -0500
@@ -1,4 +1,5 @@
 bin.includes = feature.xml,\
                Carbide_Image.png,\
-               license.txt
+               license.txt,\
+	       feature.properties
 generate.feature@com.nokia.carbide.cpp.uiq.ui.source=com.nokia.carbide.cpp.uiq.ui
\ No newline at end of file
diff -r f5529458ffba -r f330c1e8a4f3 uidesigner/com.nokia.sdt.uidesigner-feature/build.properties
--- a/uidesigner/com.nokia.sdt.uidesigner-feature/build.properties	Wed Mar 25 10:19:20 2009 -0500
+++ b/uidesigner/com.nokia.sdt.uidesigner-feature/build.properties	Wed Mar 25 11:55:19 2009 -0500
@@ -1,4 +1,5 @@
 bin.includes = feature.xml,\
                Carbide_Image.png,\
-               license.txt
+               license.txt,\
+	       feature.properties
 generate.feature@com.nokia.sdt.uidesigner.source=com.nokia.sdt.uidesigner
\ No newline at end of file