--- a/core/com.nokia.carbide.cpp.doc.user/intro/whatsnew_IntroExt.xml Tue Dec 08 13:29:23 2009 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/intro/whatsnew_IntroExt.xml Wed Dec 09 11:24:47 2009 -0600
@@ -1,4 +1,3 @@
-<<<<<<< local
<?xml version="1.0" encoding="utf-8" ?>
<introContent>
@@ -41,16 +40,6 @@
<group style-id="content-group" id="carbide-cpp">
<link
- label="Carbide.c++ News Reader (2.0.3)"
- url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.doc.user/html/reference/view_carbide_news.htm"
- id="carbide-link"
- style-id="content-link">
- <text>Provides updates on the latest Carbide, Symbian, and S60 news.</text>
- </link>
- </group>
-
- <group style-id="content-group" id="carbide-cpp">
- <link
label="On-Device Connection (2.0)"
url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_connection_wizard.htm"
id="carbide-link"
@@ -60,67 +49,5 @@
</group>
</extensionContent>
-=======
-<?xml version="1.0" encoding="utf-8" ?>
-
-<introContent>
- <extensionContent
- id="com.nokia.carbide.cpp.doc.user-whatsnew"
- style="carbide.css"
- alt-style="carbide.properties"
- name="Carbide.c++ Release Notes"
- path="whatsnew/@">
-
- <group style-id="content-group" id="carbide-cpp">
- <link
- label="Carbide.c++ Release Notes (2.4)"
- url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.doc.user/html/release_notes.htm"
- id="carbide-link"
- style-id="content-link">
- <text>Learn about what's new in Carbide.c++ for Symbian OS developers.</text>
- </link>
- </group>
-
- <group style-id="content-group" id="carbide-cpp">
- <link
- label="Performance Improvements (2.1)"
- url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.doc.user/html/release_notes.htm#210"
- id="carbide-link"
- style-id="content-link">
- <text>Carbide performance improvements in 2.1 for large project importing, building, and other critical areas.</text>
- </link>
- </group>
-
- <group style-id="content-group" id="carbide-cpp">
- <link
- label="Hover Help (2.0.4)"
- url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.sysdoc.hover/resources/help%20context/dl_hover/html/getting_started.html"
- id="carbide-link"
- style-id="content-link">
- <text>See Symbian API Reference information appear when you hover over a Symbian symbol in C/C++ editors.</text>
- </link>
- </group>
-
- <group style-id="content-group" id="carbide-cpp">
- <link
- label="Carbide.c++ News Reader (2.0.3)"
- url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.doc.user/html/reference/view_carbide_news.htm"
- id="carbide-link"
- style-id="content-link">
- <text>Provides updates on the latest Carbide, Symbian, and S60 news.</text>
- </link>
- </group>
-
- <group style-id="content-group" id="carbide-cpp">
- <link
- label="On-Device Connection (2.0)"
- url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_connection_wizard.htm"
- id="carbide-link"
- style-id="content-link">
- <text>Create remote connection settings and update Carbide software services on devices.</text>
- </link>
- </group>
-
- </extensionContent>
->>>>>>> other
+
</introContent>
\ No newline at end of file