summaryrefslogtreecommitdiffstats
path: root/qttools
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2019-11-08 09:10:04 +0100
committerLiang Qi <liang.qi@qt.io>2019-11-08 09:10:04 +0100
commitae27f21d2697edf0b513b2c52bb1ecbbe658053b (patch)
treee4e52106e657678b9d4f866e7e66cca1aaef726b /qttools
parent2a5f8edda67f9bfa0e742d913567c544fa9eda5f (diff)
parentb3f160bc3955378bb85bd8b28ba1da9118f5457e (diff)
Merge remote-tracking branch 'origin/5.15' into devHEADdev
Conflicts: coin/platform_configs/default.yaml Change-Id: Id4af2d72bb409b6851758a726677c2f2235fc0af
Diffstat (limited to 'qttools')
0 files changed, 0 insertions, 0 deletions