diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-06-07 12:06:52 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-06-07 12:52:58 +0200 |
| commit | 7fdb88a86b0782e7170eefe3dfe7ab3e9c81f847 (patch) | |
| tree | 0fb34738dd5b4abd222ffac7b25f904c456006d9 /src/plugins/directshow/directshow.json | |
| parent | badecdbc46df6ada383f1dfd006fa3dfff1706c6 (diff) | |
| parent | a6cc1af0546ab10701c10475315139ebb50ad1e5 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
Change-Id: I20470ed193e818eefedd975d89f755fb9d673241
Diffstat (limited to 'src/plugins/directshow/directshow.json')
0 files changed, 0 insertions, 0 deletions