diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-08-28 20:28:11 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-08-28 20:28:11 +0200 |
| commit | f58935ebea9f457a05839240755b032da1144d7a (patch) | |
| tree | a18a1db249327c702109352230bbfa811a8f8789 /qtwebengine | |
| parent | 097b013183e1090e6b28691136ac7d7b5bfc574e (diff) | |
| parent | 163bd8006e32184ad77654dd36d3cba417c65028 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
coin/platform_configs/default.yaml
coin/provisioning/common/linux/disable-ntp_linux.sh
coin/provisioning/qtci-linux-SLES-12-x86_64/55-emsdk.sh
coin/provisioning/qtci-linux-SLES-15-x86_64/55-emsdk.sh
emsdk.sh was moved from linux to unix, see
38e416be664dc216b332e6b4ff8d38905dfdc1e9
Change-Id: I5b06dde2860a4e4869960ae2a5be1d6a1396e957
Diffstat (limited to 'qtwebengine')
0 files changed, 0 insertions, 0 deletions