diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-24 00:12:13 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-24 00:12:13 (GMT) |
commit | 9374c12ee1a21768a2e364a052b2374ce6a1ac39 (patch) | |
tree | 69d8e3de5d84c2f201bd24d6e20b7c563651eebf /tests | |
parent | ae2ae7dfe55478f7036dfb9f301cac9f67d89f5c (diff) | |
parent | e410dad4f2ee6f381551303bd45651b3f0406e5a (diff) | |
download | Qt-9374c12ee1a21768a2e364a052b2374ce6a1ac39.zip Qt-9374c12ee1a21768a2e364a052b2374ce6a1ac39.tar.gz Qt-9374c12ee1a21768a2e364a052b2374ce6a1ac39.tar.bz2 |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging:
Fix compilation of qjpeg on MinGW with GCC 4.6
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions