summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qtextdocumentlayout_p.h
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@trolltech.com>2010-04-01 08:45:34 (GMT)
committerOlivier Goffart <ogoffart@trolltech.com>2010-04-01 08:45:34 (GMT)
commit603ee8b841385c04c5118650075134154aee29a7 (patch)
tree690a0b4abfa9a20551aab285cbb0fef49686c917 /src/gui/text/qtextdocumentlayout_p.h
parentd5e6111c62bc4437243fb1d6389e3af180f623d7 (diff)
parent8ffd45cf6832b67960dbaa10654c4b84358fe3f9 (diff)
downloadQt-603ee8b841385c04c5118650075134154aee29a7.zip
Qt-603ee8b841385c04c5118650075134154aee29a7.tar.gz
Qt-603ee8b841385c04c5118650075134154aee29a7.tar.bz2
Merge remote branch 'origin/4.7' into 4.7
Conflicts: src/gui/text/qstatictext.cpp
Diffstat (limited to 'src/gui/text/qtextdocumentlayout_p.h')
0 files changed, 0 insertions, 0 deletions