diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-07 11:13:47 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-07 11:13:47 +0100 |
| commit | 6166f102f5e52007f8e4e018adb73d26513557b3 (patch) | |
| tree | ab6dcd29f68e07cf8c6643d69af679ed9b194019 /LGPL_EXCEPTION.txt | |
| parent | 0a7b553eeab0b81502189f6244ffc65c33cdaaa0 (diff) | |
| parent | 604a5753fa2d9b8e1ef65ccd8c5fb72465462479 (diff) | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Conflicts:
src/plugins/android/src/wrappers/jni/androidcamera.cpp
Change-Id: Ibb34f710b1dfb9a23b378462f31432581c6c26f4
Diffstat (limited to 'LGPL_EXCEPTION.txt')
0 files changed, 0 insertions, 0 deletions