feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Doc: resolve merge conflicts

Browse Source 
Change-Id: I76f544e86acd903864e301c798048f95d62b79a3
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
This commit is contained in:
Leena Miettinen
2011-11-24 10:10:19 +01:00
parent faeb6b31be
commit b7692adbd6
4 changed files with 113 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/src/debugger/creator-debugger.qdoc
View File

@@ -27,7 +27,7 @@
/*!
\contentspage index.html
\previouspage creator-running-targets.html
\previouspage creator-testing.html
\page creator-debugging.html
\nextpage creator-debugging-example.html