diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-30 13:29:49 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-06-30 13:29:49 +0000 |
commit | 5f8c5a2acfeba33d2063fa9566ecb17826bf82bc (patch) | |
tree | c9920cb4d191a70960feb3832b4c3938a8eff47e /tests | |
parent | 303acdb6e5b8fa3152388f68156b4d5d2a55d5aa (diff) | |
parent | 112595bf80ff0e0ed57f73d8efb628aaa0aa8dff (diff) | |
download | qtmultimedia-5f8c5a2acfeba33d2063fa9566ecb17826bf82bc.tar.gz |
Merge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/dev
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions