diff options
author | Olivier Goffart <ogoffart@trolltech.com> | 2010-04-01 08:45:34 (GMT) |
---|---|---|
committer | Olivier Goffart <ogoffart@trolltech.com> | 2010-04-01 08:45:34 (GMT) |
commit | 603ee8b841385c04c5118650075134154aee29a7 (patch) | |
tree | 690a0b4abfa9a20551aab285cbb0fef49686c917 /src/gui/text/qtextdocumentlayout_p.h | |
parent | d5e6111c62bc4437243fb1d6389e3af180f623d7 (diff) | |
parent | 8ffd45cf6832b67960dbaa10654c4b84358fe3f9 (diff) | |
download | Qt-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