# HG changeset patch
# User fturovic <frank.turovich@nokia.com>
# Date 1272899467 18000
# Node ID 7e25a143c5982debd00fd3f6d58f31927a247a1a
# Parent  3d1366d12e2cc8e371ed4ea0b8e0c8fb0a164b2c
revised bugs lists for 2.6

diff -r 3d1366d12e2c -r 7e25a143c598 core/com.nokia.carbide.cpp.doc.user/html/bugs_fixed.htm
--- a/core/com.nokia.carbide.cpp.doc.user/html/bugs_fixed.htm	Mon May 03 08:52:54 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/bugs_fixed.htm	Mon May 03 10:11:07 2010 -0500
@@ -35,8 +35,11 @@
   <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10861">10861</a> - Launch wizard can no longer automatically select DLLs as the executable.</li>
   <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10967">10967</a> - Resolved an issue where use of the hyphen character (-) in a file name was not recognized as a valid character. </li>
   <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=11022">11022</a> - Carbide no longer relies on the <span class="code">SBS_HOME</span> environment variable being present to work with Raptor builds.</li>
+  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=11039">11039</a> - The Disassembly view now does a better job of interleaving source and disassembler instructions and adds a [inline] label to all inline functions for clarity.</li>
   <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=11072">11072</a> - Fixed an indentation issue that added additional tabs after typing &lt;enter&gt;. </li>
   <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=11096">11096</a> - Resolved a crasher where the number of binaries being debugged exceeded the stop-mode limit allowed.</li>
+  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=11131">11131</a> - Carbide now checks both the \epoc32\tools\qt and \epoc32\tools\ directories to locate qmake.</li>
+  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=11176">11176</a> - A conflict preventing the use of Ctrl+Shift+R to open a resource has been resolved.</li>
 </ul>
 <h3><a name="bugs250" id="bugs9"></a>Bugs Fixed in v2.5.0</h3>
 <ul>