diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-12 06:29:43 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-12 06:30:01 +0200 |
| commit | 030e19816a8933a8c6c0a4d8193251446d4ee514 (patch) | |
| tree | 827cfc97a1a8f0f660238e2a3b5472669f0f2077 /src/imports/multimedia/qdeclarativecameraflash.cpp | |
| parent | 1c6c85cd7c619cc15c099ae63a5d22bcf661847c (diff) | |
| parent | c7433f84288a33d6a5ea411dabf1618afcacfaf1 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: I126bc73db5b5d9b6c26cb9ff5da7ed13a16b378b
Diffstat (limited to 'src/imports/multimedia/qdeclarativecameraflash.cpp')
0 files changed, 0 insertions, 0 deletions