# HG changeset patch
# User fturovic <frank.turovich@nokia.com>
# Date 1265133406 21600
# Node ID 11480f2167cad618dc1deff03c1a2acd8c08a8f5
# Parent  00c3cae74cd67eaa4968cab84ef2cd39474d48a2# Parent  90ae1a15f8672b2e6072a129f8184e03bc7f6e43
daily merge

diff -r 90ae1a15f867 -r 11480f2167ca core/com.nokia.carbide.cpp.doc.user/html/bugs_fixed.htm
--- a/core/com.nokia.carbide.cpp.doc.user/html/bugs_fixed.htm	Tue Feb 02 10:43:09 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/bugs_fixed.htm	Tue Feb 02 11:56:46 2010 -0600
@@ -23,7 +23,11 @@
 <h3><a name="bugs250" id="bugs9"></a>Bugs Fixed in v2.5.0</h3>
 <ul>
   <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10282">10282</a> -  Fixed an issue that prevented updating of the source path in the Executables view when working from a subst drive and a project is open that contains the source file.</li>
+  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10395">10395</a> - Fixed an issue in WINSCW where a const exception is thrown but it was not getting caught by a non const catch block.</li>
   <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10396">10396</a> - Added reminder &quot;NOTE Always run the Help &gt; Check for Updates wizard and install all updates before attempting to install new software. This can prevent the occurrence of any dependency errors.&quot; to the <a href="tasks/start/carbide_updating.htm">Upgrading Carbide.c++</a> page.</li>
+  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10467">10467</a> - Fixed a timeout problem with SBS version checks that caused Carbide to hang.</li>
+  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10477">10477</a> - Fixed an internal compiler error in floating point code generation during optimization.</li>
+  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10622">10622</a> -  Fixed a path issue where the MMP Editor would display platform path macros and unknown MMP statements.</li>
 </ul>
 <h3><a name="bugs240" id="bugs8"></a>Bugs Fixed in v2.4.0</h3>
 <ul>