Mercurial Mercurial > oss > FCL > sftools > dev > ide > carbidecpp / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit the merge
authortimkelly
Wed, 25 Mar 2009 11:55:19 -0500
changeset 8 f330c1e8a4f3
parent 7 2b2ec8fad47a (diff)
parent 6 f5529458ffba (current diff)
child 10 9ee3eba76b43
child 12 6b79ffb176c5
commit the merge
--- 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
--- 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
FCL/sftools/dev/ide/carbidecpp