summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/test/compat.qdocconf
diff options
context:
space:
mode:
authorJerome Pasion <jerome.pasion@nokia.com>2011-01-05 10:41:57 (GMT)
committerJerome Pasion <jerome.pasion@nokia.com>2011-01-05 10:41:57 (GMT)
commit55d05512939b8e7a43f22a1cc423112d8fb3d2eb (patch)
tree5cb44bd6883fe8da180378fe7416d5b1514f6578 /tools/qdoc3/test/compat.qdocconf
parent9b0ad342cc888bd4291c84f63fe485bfbfdc3ce0 (diff)
parentf44f7084a3020ed8e249644d5b5e07f74cb7b070 (diff)
downloadQt-55d05512939b8e7a43f22a1cc423112d8fb3d2eb.zip
Qt-55d05512939b8e7a43f22a1cc423112d8fb3d2eb.tar.gz
Qt-55d05512939b8e7a43f22a1cc423112d8fb3d2eb.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Merging qt-doc-team into cloned repository
Diffstat (limited to 'tools/qdoc3/test/compat.qdocconf')
-rw-r--r--tools/qdoc3/test/compat.qdocconf8
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/qdoc3/test/compat.qdocconf b/tools/qdoc3/test/compat.qdocconf
index 5745ed9..0b59629 100644
--- a/tools/qdoc3/test/compat.qdocconf
+++ b/tools/qdoc3/test/compat.qdocconf
@@ -1,5 +1,5 @@
-alias.i = e
-alias.include = input
+alias.i = e
+alias.include = input
macro.0 = "\\\\0"
macro.b = "\\\\b"
@@ -27,5 +27,5 @@ macro.img = "\\image"
macro.endquote = "\\endquotation"
macro.relatesto = "\\relates"
-spurious = "Missing comma in .*" \
- "Missing pattern .*"
+spurious = "Missing comma in .*" \
+ "Missing pattern .*"