diff options
author | Alan Alpert <alan.alpert@nokia.com> | 2010-03-24 12:59:02 (GMT) |
---|---|---|
committer | Alan Alpert <alan.alpert@nokia.com> | 2010-03-24 12:59:02 (GMT) |
commit | 38db6eba54534207126915f6f195c8af9f772833 (patch) | |
tree | 3d379da271562df88b3497e9103c8584ab3641d8 /src/plugins/mediaservices | |
parent | 2fccc31367b207cff68de063d9f3d55a993cde42 (diff) | |
download | Qt-38db6eba54534207126915f6f195c8af9f772833.zip Qt-38db6eba54534207126915f6f195c8af9f772833.tar.gz Qt-38db6eba54534207126915f6f195c8af9f772833.tar.bz2 |
Help qt-qml integrate.
Git seems to be having trouble with the merge, this might make it
easier.
Diffstat (limited to 'src/plugins/mediaservices')
0 files changed, 0 insertions, 0 deletions