diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-27 20:23:52 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-27 20:23:52 +0200 |
| commit | da7d462e315fb101fc9112a294b5ca2e3bd35a75 (patch) | |
| tree | 843917c14a566949318d1e8e03aa84a6ccc041d4 /.gitignore | |
| parent | 820205e604a5f281238c23464638fdff72b969d1 (diff) | |
| parent | 6d95682d7ff282180655f2f384d8aba69c4f67af (diff) | |
| download | qtmultimedia-da7d462e315fb101fc9112a294b5ca2e3bd35a75.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I639d42e78a2b85e939c9f8e9dd5da70cdc058857
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions