summaryrefslogtreecommitdiff
path: root/doc/qtcreator.qdoc
diff options
context:
space:
mode:
authorcon <qtc-committer@nokia.com>2010-07-13 12:34:21 +0200
committercon <qtc-committer@nokia.com>2010-07-13 12:34:41 +0200
commite1890a78eb2df575c92a4340c08427a9c7229079 (patch)
tree7faa07201ed8b326e853aa9a822ad6a03dedc485 /doc/qtcreator.qdoc
parent0659559a62dee357a26857c8d473b58ba22946e6 (diff)
downloadqt-creator-e1890a78eb2df575c92a4340c08427a9c7229079.tar.gz
Remove marker.
Diffstat (limited to 'doc/qtcreator.qdoc')
-rw-r--r--doc/qtcreator.qdoc3
1 files changed, 1 insertions, 2 deletions
diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc
index 60343f1e76..437710f230 100644
--- a/doc/qtcreator.qdoc
+++ b/doc/qtcreator.qdoc
@@ -4188,10 +4188,9 @@
\previouspage creator-debugging.html
\page creator-debugging-cpp.html
\nextpage creator-debugging-example.html
-=======
+
You can use the Qt Creator \gui Debug mode to inspect the state of your
Qt projects while debugging.
->>>>>>> origin/2.0
\image qtcreator-debugger-views.png "Native debugger views"