diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-19 08:19:49 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-19 08:19:49 (GMT) |
commit | de0858687898f6e0e54cce3f986779c7aa1a350e (patch) | |
tree | db90ba9785f4492dac7971bbc060be81605b6802 /qmake/generators | |
parent | 85611635a3589d56c2670445ea5272e864e57a98 (diff) | |
parent | 650fefd7e25b10d88048d2a465a27c479d80636d (diff) | |
download | Qt-de0858687898f6e0e54cce3f986779c7aa1a350e.zip Qt-de0858687898f6e0e54cce3f986779c7aa1a350e.tar.gz Qt-de0858687898f6e0e54cce3f986779c7aa1a350e.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
removed test file, part of mediaservice removal.
Rebuild configure.exe
Rebuild configure following the removal of media services.
More mediaservices removal work.
Removed mediaservices.
Diffstat (limited to 'qmake/generators')
0 files changed, 0 insertions, 0 deletions