summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorDavid Boddie <david.boddie@nokia.com>2010-09-03 12:24:56 (GMT)
committerDavid Boddie <david.boddie@nokia.com>2010-09-03 12:24:56 (GMT)
commit36ecdffdb2a2c47b37584eefe57f92a65d6f9030 (patch)
treee8806460f39045114ee9611b215c0e659a9f8276 /tools
parenta2203d680d8a24113daab08046154c2c5234df4f (diff)
parent78381dbc9701015aef43736fb7d22cf6e66984c7 (diff)
downloadQt-36ecdffdb2a2c47b37584eefe57f92a65d6f9030.zip
Qt-36ecdffdb2a2c47b37584eefe57f92a65d6f9030.tar.gz
Qt-36ecdffdb2a2c47b37584eefe57f92a65d6f9030.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'tools')
-rw-r--r--tools/qdoc3/test/qt-html-templates.qdocconf2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf
index 8d4d27f..ed5ee17 100644
--- a/tools/qdoc3/test/qt-html-templates.qdocconf
+++ b/tools/qdoc3/test/qt-html-templates.qdocconf
@@ -171,5 +171,5 @@ HTML.footer = " <!-- /div -->\n" \
" </form>\n" \
" </div>\n" \
" <div id=\"blurpage\">\n" \
- " </div>\n" \
+ " <!--/div -->\n" \
" </div>\n"