merge commit RCL_2_4
authortimkelly
Tue, 16 Feb 2010 13:44:12 -0600
branchRCL_2_4
changeset 968 bff887fe7694
parent 967 885b827031ab (diff)
parent 966 15c9cbbf6707 (current diff)
child 973 bd54fb1ea34a
merge commit
debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/SymbianLaunchShortcut.java
debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/CommandRunLaunchWizard2.java
debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/LaunchOptionsData.java
--- a/qt/com.nokia.carbide.cpp.qt.core/build.properties	Tue Feb 16 13:41:43 2010 -0600
+++ b/qt/com.nokia.carbide.cpp.qt.core/build.properties	Tue Feb 16 13:44:12 2010 -0600
@@ -1,4 +1,5 @@
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
-               .
+               .,\
+               plugin.xml