diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-21 10:53:39 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-21 10:53:39 (GMT) |
commit | 3a7b70637f94a85702c6578bb13a1e6594358d08 (patch) | |
tree | 8e69fa40e026d0e777face62e5ab7b52abdfa6c3 /.hgignore | |
parent | 0cd3de1e75a39b00243894f23650092a41c3ed63 (diff) | |
parent | ceff2321d7b7eaa4608a1baa5de66dbce8733342 (diff) | |
download | Qt-3a7b70637f94a85702c6578bb13a1e6594358d08.zip Qt-3a7b70637f94a85702c6578bb13a1e6594358d08.tar.gz Qt-3a7b70637f94a85702c6578bb13a1e6594358d08.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:
Minor modification to allow compilation on WinCE and AIX. Removed executable attributes.
Diffstat (limited to '.hgignore')
0 files changed, 0 insertions, 0 deletions