summaryrefslogtreecommitdiff
path: root/qtmultimedia.pro
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-09-19 14:29:40 +0200
committerLiang Qi <liang.qi@qt.io>2016-09-19 14:29:47 +0200
commit01c9322bfe918b886468eb520d77b21b6d8c0c11 (patch)
tree23362a67d26b7b295a04e8cbacd64ee20393f990 /qtmultimedia.pro
parent0f47f44d2fc7b3fac7fdd8ee6eeafd767c43ec2e (diff)
parent256ee311b936d69561e97f7f8ee832cff93cb509 (diff)
downloadqtmultimedia-01c9322bfe918b886468eb520d77b21b6d8c0c11.tar.gz
Merge remote-tracking branch 'origin/5.7' into 5.8
Change-Id: I022c07dab3ded6072f7c103e299822caaf40cf34
Diffstat (limited to 'qtmultimedia.pro')
0 files changed, 0 insertions, 0 deletions