# HG changeset patch
# User Chad Peckham <chad.peckham@nokia.com>
# Date 1250018939 18000
# Node ID 41f62ef6635ee87a5a64d5c483d712e8408770f8
# Parent  491ffdbbc5b5bf1c078df6ee60d5287cc5c957cd# Parent  2f546bc3350a51fc68667480d5caf9f8aa2f3109
merge

diff -r 491ffdbbc5b5 -r 41f62ef6635e debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/SettingsData.java
--- a/debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/SettingsData.java	Tue Aug 11 14:23:24 2009 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/SettingsData.java	Tue Aug 11 14:28:59 2009 -0500
@@ -428,7 +428,6 @@
 	
 	public static void setRomImgTab(ILaunchConfigurationWorkingCopy configuration, IProject project) {
 
-		configuration.setAttribute( PreferenceConstants.J_PN_DebugNonXip, false);
 		configuration.setAttribute( PreferenceConstants.J_PN_DownloadRomImage, false);
 		configuration.setAttribute( PreferenceConstants.J_PN_RomImagePath, ""); //$NON-NLS-1$
 		configuration.setAttribute( PreferenceConstants.J_PN_DownloadAddress, 0);