diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-19 15:03:16 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-19 15:03:16 (GMT) |
commit | b42d2831dff9bbb7254e0b4f014958dded2f7e59 (patch) | |
tree | 48a7d29b2cac898f14bda207cca212c2839c78d0 /tests/auto/qimagereader/qimagereader.qrc | |
parent | 039ed59f899c6ff4bd82f7fa029441551ceb54dc (diff) | |
parent | f19a95429a5e9b760f49152ebdf9b39474750116 (diff) | |
download | Qt-b42d2831dff9bbb7254e0b4f014958dded2f7e59.zip Qt-b42d2831dff9bbb7254e0b4f014958dded2f7e59.tar.gz Qt-b42d2831dff9bbb7254e0b4f014958dded2f7e59.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Extend the detection of CPU feature for x86
Remove some more unneeded files from libjpeg, avoiding GPL
Diffstat (limited to 'tests/auto/qimagereader/qimagereader.qrc')
0 files changed, 0 insertions, 0 deletions