diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-10-07 12:49:14 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-10-07 12:49:55 +0200 |
| commit | 9bfa486dd097723bd2fc0d8d85ebfb8dca6bbe12 (patch) | |
| tree | 06bd66879c1cee90b31e42e855ed5e1744c290fe /qtremoteobjects | |
| parent | 4e8b5bae5b14fad8e5498d37ec8c6682ee8702b1 (diff) | |
| parent | 7b9c3ced842644736da18859b7c0d78182901f23 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
coin/platform_configs/default.txt
coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh
Change-Id: Ie454d4eff0317cea2fec6870b5ca53f36ad2f191
Diffstat (limited to 'qtremoteobjects')
0 files changed, 0 insertions, 0 deletions