diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-02-03 09:15:43 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-02-03 09:15:43 +0100 |
| commit | d641d6546ba36aea2f527cca852b04fcf2a97f6d (patch) | |
| tree | 50ef91108a67410e5ed4d69187df44e580ea98d5 /qtmultimedia | |
| parent | 321d5f1488938ad80f207a03a02101ebbf8ce763 (diff) | |
| parent | a36977963a9b6fad940f6ae8395401ce567f4b49 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.8
Conflicts:
coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh
Change-Id: I10fcdfc0af68741d931f4732783bafdad2fffc4a
Diffstat (limited to 'qtmultimedia')
0 files changed, 0 insertions, 0 deletions