summaryrefslogtreecommitdiffstats
path: root/src/xml/sax/qxml.cpp
diff options
context:
space:
mode:
authorDavid Boddie <dboddie@trolltech.com>2009-05-20 11:24:25 (GMT)
committerDavid Boddie <dboddie@trolltech.com>2009-05-20 11:24:25 (GMT)
commit1ee923a21c270094203c5d2a861a8015598ceda1 (patch)
treed53b292eabb1fc565840153d8f5efb3c3b2afd52 /src/xml/sax/qxml.cpp
parent4e4ff34e3c4c905f17aa02160a17fdb7b9ad61ed (diff)
parent691e83425ac5883922837bc5fd1efb5385db9871 (diff)
downloadQt-1ee923a21c270094203c5d2a861a8015598ceda1.zip
Qt-1ee923a21c270094203c5d2a861a8015598ceda1.tar.gz
Qt-1ee923a21c270094203c5d2a861a8015598ceda1.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts: doc/src/stylesheet.qdoc
Diffstat (limited to 'src/xml/sax/qxml.cpp')
-rw-r--r--src/xml/sax/qxml.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xml/sax/qxml.cpp b/src/xml/sax/qxml.cpp
index c78d4ba..ade0339 100644
--- a/src/xml/sax/qxml.cpp
+++ b/src/xml/sax/qxml.cpp
@@ -2107,7 +2107,7 @@ events are reported.
You can set the lexical handler with
QXmlReader::setLexicalHandler().
- This interface's design is based on the the SAX2 extension
+ This interface's design is based on the SAX2 extension
LexicalHandler.
The interface provides the startDTD(), endDTD(), startEntity(),