diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-09-27 07:27:28 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-09-27 07:27:28 +0200 |
| commit | 076fb6bd6de2a49877ef80b78b637da3526737b4 (patch) | |
| tree | 81963e4a61fb6188d8ab4e59df2d4b08d8b72b4d /coin/platform_configs/default.yaml | |
| parent | c0fce7a3b37db53289ffd1e44c58f0bfc0601229 (diff) | |
| parent | 80791b03ee245b893e638a78508f1fa957f0b08d (diff) | |
Merge remote-tracking branch 'origin/5.13.1' into 5.13
Conflicts:
coin/platform_configs/qt5.yaml
Change-Id: Iaeec542042807c00e4c2597b546b00ce0f267b48
Diffstat (limited to 'coin/platform_configs/default.yaml')
0 files changed, 0 insertions, 0 deletions