diff options
| author | Liang Qi <liang.qi@nokia.com> | 2011-07-22 08:38:28 (GMT) |
|---|---|---|
| committer | Liang Qi <liang.qi@nokia.com> | 2011-07-22 08:38:28 (GMT) |
| commit | a0da99611734651f8ad4de3090f7ab05c2b2f9c1 (patch) | |
| tree | fe8b387b4de7757e97d2a27e2e1568470a3fca9f /src/gui/image/qiconengineplugin.h | |
| parent | b8327a0d5c5192750f7bf959290f6a50cdcb85b5 (diff) | |
| parent | 32763b898ad96cc0906aaf3406325134b849a284 (diff) | |
| download | Qt-a0da99611734651f8ad4de3090f7ab05c2b2f9c1.zip Qt-a0da99611734651f8ad4de3090f7ab05c2b2f9c1.tar.gz Qt-a0da99611734651f8ad4de3090f7ab05c2b2f9c1.tar.bz2 | |
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
Conflicts:
src/gui/image/qtiffhandler.cpp
Diffstat (limited to 'src/gui/image/qiconengineplugin.h')
0 files changed, 0 insertions, 0 deletions