diff options
author | Liang Qi <liang.qi@qt.io> | 2016-06-20 21:35:34 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-06-20 21:35:34 +0200 |
commit | e205785b5c442517171530320d70691b79d4fc77 (patch) | |
tree | 9db95cead55ec7d0a68bd137baa0c2ed9bd2bb3f /qtmultimedia | |
parent | 8ddc3c1254149920b8ad9e691ea65c88fd149ee2 (diff) | |
parent | 49f1a7f0a61dfcb6a2b38f5f5c2ce4fdccc815e9 (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I2e0204f745b482e4faa210ec7f8b95463267b3ca
Diffstat (limited to 'qtmultimedia')
0 files changed, 0 insertions, 0 deletions