diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-11-22 17:26:28 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-11-22 17:26:28 +0100 |
| commit | 86b9edca68b6ea5867127756a791b7149fd7cdf5 (patch) | |
| tree | 0e32b12d9ce492ca5b79b7fe23a38700d7bc8577 /qtwebsockets | |
| parent | ae27f21d2697edf0b513b2c52bb1ecbbe658053b (diff) | |
| parent | b5c9819be2ec2983176d00466f561f8008fc51bd (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
coin/platform_configs/default.yaml
coin/platform_configs/qtbase.yaml
coin/platform_configs/qtconnectivity.yaml
Change-Id: I1f6b8dff622c3899b2d655108f638404b3bc2189
Diffstat (limited to 'qtwebsockets')
0 files changed, 0 insertions, 0 deletions