# HG changeset patch # User fturovic # Date 1265227801 21600 # Node ID 067c6d73417138e0f4e3c2c69393932a65ccd5a7 # Parent 0d2baa78c988db846a39a50f90192ce73539511d# Parent 3419376b791a51a60940f2c9f71c32a8b14371c4 daily merge diff -r 3419376b791a -r 067c6d734171 carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/html/legal.htm --- a/carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/html/legal.htm Wed Feb 03 10:56:46 2010 -0600 +++ b/carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/html/legal.htm Wed Feb 03 14:10:01 2010 -0600 @@ -1,35 +1,35 @@ - - - - - - Legal - - - - -

License Information

-
COPYRIGHTS
-

Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. This component and the accompanying materials are made available under the terms of the License "Symbian Foundation License v1.0" which accompanies this distribution, and is available at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".

-
Initial Contributors:
-

Nokia Corporation - initial contribution

-
NOTICES
-

Portions of this product are covered by the following licenses:

- - + + + + + + Legal + + + + +

License Information

+
COPYRIGHTS
+

Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. This component and the accompanying materials are made available under the terms of the License "Symbian Foundation License v1.0" which accompanies this distribution, and is available at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".

+
Initial Contributors:
+

Nokia Corporation - initial contribution

+
NOTICES
+

Portions of this product are covered by the following licenses:

+ + \ No newline at end of file diff -r 3419376b791a -r 067c6d734171 carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/html/sdkTOC.htm --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/html/sdkTOC.htm Wed Feb 03 14:10:01 2010 -0600 @@ -0,0 +1,43 @@ + + + + + + Carbide SDK Overview + + + + + +

Carbide SDK Overview

+ + + + \ No newline at end of file diff -r 3419376b791a -r 067c6d734171 carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/sdkTOC.xml --- a/carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/sdkTOC.xml Wed Feb 03 10:56:46 2010 -0600 +++ b/carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/sdkTOC.xml Wed Feb 03 14:10:01 2010 -0600 @@ -1,29 +1,31 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 3419376b791a -r 067c6d734171 core/com.nokia.carbide.cpp/html/welcome_note.htm --- a/core/com.nokia.carbide.cpp/html/welcome_note.htm Wed Feb 03 10:56:46 2010 -0600 +++ b/core/com.nokia.carbide.cpp/html/welcome_note.htm Wed Feb 03 14:10:01 2010 -0600 @@ -9,7 +9,7 @@

Welcome to Carbide.c++ 2.5.0

Thank you for installing Carbide.c++2.5! It's an improvement over 2.4 with many improvements including support for Eclipse 3.5 and CDT 6.0, as well as numerous bug fixes.

-

However, perhaps the best part about Carbide.c++ is the Carbide.c++ Development Kit (CDK) that you can use to build custom extensions for Carbide.c++. Update your installation of Carbide through the Carbide.c++ Update Site to get a copy of the Carbide.c++ Development Kit > Carbide.c++ Plug-in SDK. Take a look, and let us know what you build!

+

However, perhaps the best part about Carbide.c++ is the Carbide.c++ Development Kit (CDK) that you can use to build custom extensions for Carbide.c++. Update your installation of Carbide through the Carbide.c++ Update Site to get a copy of the Carbide.c++ Development Kit > Carbide.c++ Plug-in SDK. Take a look, and let us know what you build!

Finally, if you find bugs, please let us know by submitting it at the new Carbide Bugzilla bug tracking site located at https://xdabug001.ext.nokia.com/bugzilla

For any other questions, please don't hesitate to contact us.

Thank you again for choosing Carbide.c++! We hope you like it.