diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-06-16 08:17:02 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-06-16 08:17:02 (GMT) |
| commit | 8cb10f381af7fd6f1fa0ffc946f6a4e6ba106d5d (patch) | |
| tree | c328303e395088f88ba721e96bd6e09a008ad581 /src/gui/text/qtextoption.cpp | |
| parent | 71e333de0c258796a924b1d858253381d689cf19 (diff) | |
| parent | bb8142436bacf5a4fa31880b58a8b3b6bc7b4d5b (diff) | |
| download | Qt-8cb10f381af7fd6f1fa0ffc946f6a4e6ba106d5d.zip Qt-8cb10f381af7fd6f1fa0ffc946f6a4e6ba106d5d.tar.gz Qt-8cb10f381af7fd6f1fa0ffc946f6a4e6ba106d5d.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6
Conflicts:
src/plugins/imageformats/gif/qgifhandler.cpp
Diffstat (limited to 'src/gui/text/qtextoption.cpp')
0 files changed, 0 insertions, 0 deletions