# HG changeset patch # User fturovic # Date 1265658802 21600 # Node ID c9573e1f3013f41743b22b6c63deca4c802a65b3 # Parent 53470a491c0bbb1de650ad999897ef39bcaa71be# Parent 3a0c0b389d0d2bd9de5fd1a675b7d20a1c5cc788 daily merge diff -r 3a0c0b389d0d -r c9573e1f3013 core/com.nokia.carbide.cpp.doc.user/html/images/icons/wiz_launch_config_sophia.png Binary file core/com.nokia.carbide.cpp.doc.user/html/images/icons/wiz_launch_config_sophia.png has changed diff -r 3a0c0b389d0d -r c9573e1f3013 core/com.nokia.carbide.cpp.doc.user/html/projects/images/wnd_debug_sophia_launch_config.png Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/images/wnd_debug_sophia_launch_config.png has changed diff -r 3a0c0b389d0d -r c9573e1f3013 core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_main.htm --- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_main.htm Fri Feb 05 15:32:05 2010 -0600 +++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_main.htm Mon Feb 08 13:53:22 2010 -0600 @@ -88,7 +88,8 @@

Stop-mode Main page

-

The Symbian OS System TRK, and Trace32 launch configurations uses the Main page to defines the project and the executable to launch on the target device.

+

The Symbian OS System TRK, and Trace32 launch configurations uses the Main page to defines the project and the executable to launch on the target device.

+

Figure 3. Main page (TRACE32 shown)

Table 3. Stop-mode Main page — items
@@ -123,7 +124,11 @@ - + + +
 
+ \ No newline at end of file diff -r 3a0c0b389d0d -r c9573e1f3013 core/com.nokia.carbide.cpp.doc.user/html/projects/launch/wnd_debug_configuration.htm --- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/wnd_debug_configuration.htm Fri Feb 05 15:32:05 2010 -0600 +++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/wnd_debug_configuration.htm Mon Feb 08 13:53:22 2010 -0600 @@ -6,6 +6,7 @@ Debug Window +

Debug Window

@@ -15,7 +16,7 @@


Figure 1 - Debug or launch configuration window (Symbian OS emulation view)

Table 1. Debug window — common items
- +
diff -r 3a0c0b389d0d -r c9573e1f3013 core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/images/Debug_Config_sophia.png Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/images/Debug_Config_sophia.png has changed
Icon Item