diff options
author | Gunnar Sletta <gunnar@trolltech.com> | 2010-02-11 14:18:38 (GMT) |
---|---|---|
committer | Gunnar Sletta <gunnar@trolltech.com> | 2010-02-11 14:18:38 (GMT) |
commit | a35186a00ed789ac98c193c4ded2bab62f2a018a (patch) | |
tree | 393311979e198e8d081c45711fb009c521c6356e /src/gui/image/qimageiohandler.cpp | |
parent | 2acc883b3a339b716da9249a1366b08225acbd8a (diff) | |
parent | 52a65fde8e97f1f6dc26192058fadc1d2275983a (diff) | |
download | Qt-a35186a00ed789ac98c193c4ded2bab62f2a018a.zip Qt-a35186a00ed789ac98c193c4ded2bab62f2a018a.tar.gz Qt-a35186a00ed789ac98c193c4ded2bab62f2a018a.tar.bz2 |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
Diffstat (limited to 'src/gui/image/qimageiohandler.cpp')
0 files changed, 0 insertions, 0 deletions