diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-09-27 09:44:15 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-09-27 10:17:04 +0200 |
| commit | 95baba26936cdabe5cf4d5eaa4d59f97e4a2102d (patch) | |
| tree | 5fd4c75167a5a040bb34aeec54d5e8ef2a06f137 /src/core/media_capture_devices_dispatcher.h | |
| parent | 32b67aea15fdf47d6b86e1e5303d25ec6e8ded37 (diff) | |
| parent | dd7c3f92c4668ed9ebdb1714d00de1cb61ab7dd4 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
configure.json
configure.pri
src/3rdparty
Change-Id: I2e0614b33596fe66999508556c464ed84acc8e2f
Diffstat (limited to 'src/core/media_capture_devices_dispatcher.h')
0 files changed, 0 insertions, 0 deletions