diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-09-10 10:12:36 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-09-10 10:12:36 +0200 |
| commit | e866953948d9029e29b9ca7e7b0771ed33c8d2c3 (patch) | |
| tree | f048c9cde7b6374c844cba513658564fe476abc1 /qtlocation | |
| parent | e95824f59e688963a7a5dff4dc214d8a5c829e9f (diff) | |
| parent | 6a919fb8f54bba0dce3223cc240c796c4c8ac1f6 (diff) | |
Merge remote-tracking branch 'origin/5.11.2' into 5.11
Conflicts:
coin/platform_configs/qt5.txt
Change-Id: I430b2b99d1ed463d1750c6f1a5955bc0742f4b35
Diffstat (limited to 'qtlocation')
0 files changed, 0 insertions, 0 deletions