diff options
author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-11-07 00:00:10 (GMT) |
---|---|---|
committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-11-07 00:00:10 (GMT) |
commit | 9ff56c800aaf7b1e7d2a26b24601936fabfbcc3f (patch) | |
tree | 84d3836ef6db244633c569e8c5bc77809416ca9f /src/gui/image/qpictureformatplugin.h | |
parent | 1f7fe30841f6bd3557c9c5d90faeaeb162c4a967 (diff) | |
parent | fe949effc79830f7e40ddd238114dc8e0553291c (diff) | |
download | Qt-9ff56c800aaf7b1e7d2a26b24601936fabfbcc3f.zip Qt-9ff56c800aaf7b1e7d2a26b24601936fabfbcc3f.tar.gz Qt-9ff56c800aaf7b1e7d2a26b24601936fabfbcc3f.tar.bz2 |
Merge branch 'master-upstream' into master-water
Diffstat (limited to 'src/gui/image/qpictureformatplugin.h')
0 files changed, 0 insertions, 0 deletions