# HG changeset patch
# User timkelly
# Date 1285181701 18000
# Node ID 42a54f0190c1d9c20ecb293cfeb6eda7a2411c9c
# Parent  0a42921f1c7641306b0c34f9358d84dba1312f01# Parent  3d4e0b2128c15f45be02b38877b2f005d0396a42
merge commit

diff -r 0a42921f1c76 -r 42a54f0190c1 core/com.nokia.carbide.cpp.doc.user/html/bugs_fixed.htm
--- a/core/com.nokia.carbide.cpp.doc.user/html/bugs_fixed.htm	Wed Sep 22 13:54:26 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/bugs_fixed.htm	Wed Sep 22 13:55:01 2010 -0500
@@ -22,8 +22,15 @@
 <ul>
     <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10833">10755</a> - The News Reader has transformed into the Carbide Portal which no longer causes any slowdowns until its accessed.</li>
     <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10833">10833</a> - Fixed an ordering issue when spilling byte instructions and only the EBX and EDI registers are available.</li>
-    <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10833"> 11239</a> - Fixed an issue that caused variables to display incorrectly during a debug session. </li>
+    <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10833">11239</a> - Fixed an issue that caused variables to display incorrectly during a debug session. </li>
     <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=11563">11563</a> - The Build Project dialog now also shows the project name. </li>
+    <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=11650">11650</a> - Fixed an issue that prevented copying of the executables listed in the Executables view for pasting into another file.</li>
+    <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=11744">11744</a> - Resolved an issue that prevented breakpoints from being hit when two processes were being debugged.</li>
+    <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=11759">11759</a> - Fixed an issue where the line being executed was not the line currently pointed to in the display.</li>
+    <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=11874">11874</a> - Syntax coloring no longer flickers on/off during a stepover action.</li>
+    <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=11926">11926</a> - The debugger now correctly uses <span class="code">controlif</span> single stepover instead of <span class="code">stepinto</span> at branch instructions.</li>
+    <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=11947">11947</a> - The epoc engine now correctly replaces the '~' character in def files with a directory based on the current build configuration.</li>
+    <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=11995">11995</a> - You can now toggle service testing on and off from within the Remote Connections view.</li>
 </ul>
 <h4><a name="bugs270" id="bugs2"></a>v2.7.0</h4>
 <ul>
diff -r 0a42921f1c76 -r 42a54f0190c1 core/com.nokia.carbide.cpp.doc.user/html/images/about_cpp.png
Binary file core/com.nokia.carbide.cpp.doc.user/html/images/about_cpp.png has changed
diff -r 0a42921f1c76 -r 42a54f0190c1 core/com.nokia.carbide.cpp.doc.user/html/reference/images/tab_new_conn_install_agent.png
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/tab_new_conn_install_agent.png has changed
diff -r 0a42921f1c76 -r 42a54f0190c1 core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml
--- a/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml	Wed Sep 22 13:54:26 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml	Wed Sep 22 13:55:01 2010 -0500
@@ -284,8 +284,7 @@
     <topic label="Stop mode projects" 				href="html/tasks/StopModeToc.htm">
       <topic label="On-Device Debugging Preconditions" 		href="html/tasks/debugger/stop_mode_debug_precond.htm" />
       <topic label="Stop Mode Debug Examples"  >
-        <topic label="Stop Mode Debug Example 1" 			href="html/tasks/debugger/stop_mode_debug.htm" />
-        <topic label="Stop Mode Debug Example 2" 			href="html/tasks/debugger/stop_mode_debug02.htm" />
+        <topic label="Stop Mode Debug Example" 			href="html/tasks/debugger/stop_mode_debug.htm" />
       </topic>
       <topic label="Building a ROM Image File"            href="html/reference/ROM_build_settings.html" />
       <topic label="Toggle HW Breakpoint"           		href="html/reference/menus/hardware_breakpoints.htm" />
diff -r 0a42921f1c76 -r 42a54f0190c1 core/com.nokia.carbide.cpp/about.html
--- a/core/com.nokia.carbide.cpp/about.html	Wed Sep 22 13:54:26 2010 -0500
+++ b/core/com.nokia.carbide.cpp/about.html	Wed Sep 22 13:55:01 2010 -0500
@@ -11,8 +11,9 @@
 <p align="center">&nbsp;</p>
 <table width="530" border="0" align="center" cellspacing="5" bgcolor="#FFFFFF">
   <tr>
-    <td width="215"><img src="icons/about.png" width="215" height="199"></td>
-    <td width="294"><p align="right" class="text"><b><img src="intro/css/graphics/rootpage/brandmark.gif" ></b></p>
+    <td width="215"><img src="icons/about.png" width="219" height="258"></td>
+    <td width="294"><p align="right" class="text"><b><img src="intro/css/graphics/rootpage/brandmark.gif" width="220" height="54" ></b></p>
+      <p class="text">&nbsp;</p>
       <p class="text">&nbsp;</p>
       <p class="titleSmall">Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).  
 All rights reserved. <br>
diff -r 0a42921f1c76 -r 42a54f0190c1 core/com.nokia.carbide.cpp/icons/about.png
Binary file core/com.nokia.carbide.cpp/icons/about.png has changed
diff -r 0a42921f1c76 -r 42a54f0190c1 core/com.nokia.carbide.cpp/intro/css/graphics/rootpage/brandmark.gif
Binary file core/com.nokia.carbide.cpp/intro/css/graphics/rootpage/brandmark.gif has changed
diff -r 0a42921f1c76 -r 42a54f0190c1 templates/com.nokia.carbide.cpp.templates/plugin.xml
--- a/templates/com.nokia.carbide.cpp.templates/plugin.xml	Wed Sep 22 13:54:26 2010 -0500
+++ b/templates/com.nokia.carbide.cpp.templates/plugin.xml	Wed Sep 22 13:55:01 2010 -0500
@@ -42,7 +42,7 @@
             location="templates/projecttemplates/Symbian-Empty/template.xml"
             templateId="com.nokia.carbide.cpp.templates.symbian.empty"
             wizardId="com.nokia.carbide.cpp.project.ui.wizards.NewSymbianOSCppProjectWizard"/>
-
+		<!-- This template does not fully work - see bugzilla 12181
       <template
       		displayName="%ansic.label"
             filterArguments=""
@@ -50,7 +50,7 @@
             image="icons/icon_symbian.gif"
             location="templates/projecttemplates/OpenC-HelloWorld/template.xml"
             templateId="com.nokia.carbide.cpp.templates.openC.helloworld"
-            wizardId="com.nokia.carbide.cpp.project.ui.wizards.NewSymbianOSCppProjectWizard"/>
+            wizardId="com.nokia.carbide.cpp.project.ui.wizards.NewSymbianOSCppProjectWizard"/> -->
    </extension>
 
 	<!-- CLASS WIZARDS -->