# HG changeset patch # User fturovic # Date 1270146316 18000 # Node ID 0af9cb0ed84ec604d26a6de6ff2691b03b5df107 # Parent bd764b5a6548be8e0d2ad3e9a91dc73a09834474# Parent 73a397acd93cc2de0f3736377e1ada57606c63fb commit merge diff -r 73a397acd93c -r 0af9cb0ed84e core/com.nokia.carbide.cpp.doc.user/build.properties --- a/core/com.nokia.carbide.cpp.doc.user/build.properties Thu Apr 01 12:02:17 2010 -0500 +++ b/core/com.nokia.carbide.cpp.doc.user/build.properties Thu Apr 01 13:25:16 2010 -0500 @@ -1,22 +1,12 @@ -bin.includes = plugin.xml,\ +bin.includes = book.css,\ debuggerTOC.xml,\ intro/,\ - index.xml,\ tocCarbide.xml,\ - book.css,\ - tocRelease.xml,\ - src.includes = META-INF/,\ - debuggerTOC.xml,\ + plugin.xml,\ + html/ +src.includes = tocCarbide.xml,\ plugin.xml,\ - index.xml,\ - tocRelease.xml,\ - tocCarbide.xml,\ - book.css,\ - META-INF/,\ - html/ -src.includes = book.css,\ + intro/,\ + html/,\ debuggerTOC.xml,\ - html/,\ - intro/,\ - tocCarbide.xml,\ - plugin.xml + book.css diff -r 73a397acd93c -r 0af9cb0ed84e core/com.nokia.carbide.cpp.doc.user/html/images/utf.png Binary file core/com.nokia.carbide.cpp.doc.user/html/images/utf.png has changed diff -r 73a397acd93c -r 0af9cb0ed84e core/com.nokia.carbide.cpp.doc.user/html/index.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/core/com.nokia.carbide.cpp.doc.user/html/index.xml Thu Apr 01 13:25:16 2010 -0500 @@ -0,0 +1,760 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 73a397acd93c -r 0af9cb0ed84e core/com.nokia.carbide.cpp.doc.user/html/utf.png Binary file core/com.nokia.carbide.cpp.doc.user/html/utf.png has changed diff -r 73a397acd93c -r 0af9cb0ed84e core/com.nokia.carbide.cpp.doc.user/index.xml --- a/core/com.nokia.carbide.cpp.doc.user/index.xml Thu Apr 01 12:02:17 2010 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,760 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r 73a397acd93c -r 0af9cb0ed84e core/com.nokia.carbide.cpp.doc.user/plugin.xml --- a/core/com.nokia.carbide.cpp.doc.user/plugin.xml Thu Apr 01 12:02:17 2010 -0500 +++ b/core/com.nokia.carbide.cpp.doc.user/plugin.xml Thu Apr 01 13:25:16 2010 -0500 @@ -14,11 +14,23 @@ file="tocRelease.xml" primary="false"/> --> + - + + + + + + + + + + + + @@ -221,13 +233,6 @@ - - - - - - - diff -r 73a397acd93c -r 0af9cb0ed84e core/com.nokia.carbide.cpp/carbide_ide.target --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/core/com.nokia.carbide.cpp/carbide_ide.target Thu Apr 01 13:25:16 2010 -0500 @@ -0,0 +1,14 @@ + + + + + + + + + + + + + +