merge heads
authorfturovic <frank.turovich@nokia.com>
Wed, 03 Jun 2009 14:54:51 -0500
changeset 198 bd0210e4c71e
parent 197 9a882d9560d4 (diff)
parent 196 e58c537ddd6e (current diff)
child 204 c14cf2c1fe78
child 205 2b3a45f17e6a
merge heads
debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/CarbideExecutableImporter.java
debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/CarbideSourceFilesProvider.java
project/com.nokia.carbide.cpp.epoc.engine/src/com/nokia/carbide/cpp/epoc/engine/model/sbv/ESBVFlags.java
--- a/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml	Tue Jun 02 10:01:32 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml	Wed Jun 03 14:54:51 2009 -0500
@@ -189,7 +189,7 @@
 			<topic label="New Launch Configuration Wizard"	href="html/projects/launch/wiz_new_launch_config.htm" />
 			<topic label="Debug dialog"						href="html/projects/launch/wnd_debug_configuration.htm" />
 
-		    <topic label="Launch configurations"			href="html/concepts/launch_configuration.htm" >
+		    <topic label="Launch types"			href="html/concepts/launch_configuration.htm" >
 				<topic label="Applications"					href="html/projects/launch/applications.htm" />
 				<topic label="Application TRK"				href="html/projects/launch/run_mode.htm" />
 				<topic label="Attach to Process"			href="html/projects/launch/attach_process.htm" />