diff options
author | Justin McPherson <justin.mcpherson@nokia.com> | 2010-04-23 00:26:25 (GMT) |
---|---|---|
committer | Justin McPherson <justin.mcpherson@nokia.com> | 2010-04-23 00:26:25 (GMT) |
commit | af9fa6d83b30fb6434eefc478ab97c67c8e6ede4 (patch) | |
tree | 9fbfdfd05edbb9363aa738c545140d53323f0b8f /qmake/qmake.pri | |
parent | 478e914638f2131d1547c4e2dc4659723657194d (diff) | |
parent | dea1e487b62bab557111e75bd1f534f16e9ca763 (diff) | |
download | Qt-af9fa6d83b30fb6434eefc478ab97c67c8e6ede4.zip Qt-af9fa6d83b30fb6434eefc478ab97c67c8e6ede4.tar.gz Qt-af9fa6d83b30fb6434eefc478ab97c67c8e6ede4.tar.bz2 |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7
Diffstat (limited to 'qmake/qmake.pri')
0 files changed, 0 insertions, 0 deletions