diff options
| author | Liang Qi <liang.qi@qt.io> | 2020-07-02 11:22:30 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2020-07-02 11:22:30 +0200 |
| commit | 029cabb7292b4213bf28a6a8808a8ed38689a8d6 (patch) | |
| tree | 94817fbd83cf43e6931effbbe62e85cbb9f8beda /qtcharts | |
| parent | 67ff8eb9585406fbd781f746e2a00f91ff368301 (diff) | |
| parent | 7143d018dc7f1cbe5b7bd3d5fb5a8dd50fe71589 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
coin/platform_configs/default.yaml
coin/platform_configs/qt5.yaml
coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh
Change-Id: I57f8a62c4f146cd1eda26885ce1507c072cb107f
Diffstat (limited to 'qtcharts')
0 files changed, 0 insertions, 0 deletions