summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2020-04-23 10:02:32 +0200
committerLiang Qi <liang.qi@qt.io>2020-04-23 10:02:32 +0200
commit076fdbe289d4edc309f0e4589f7f5907bd36f86c (patch)
treec348e14aa3ee8879e78b763f5f2a0aab320c0d46
parent0f0ff063d2994c4ae2c610b570aed1a18bee2a62 (diff)
parentcd7c03f4de00862c095a84a7bf73869bd7dbdf14 (diff)
Merge remote-tracking branch 'origin/5.12.8' into 5.12wip/qtsaferenderer/masterwip/qtsaferenderer/1.2wip/qtsaferenderer/1.1
Conflicts: .gitmodules Change-Id: I5a3c7de3adc990e1294bb0fde461ddd4e1557b37
0 files changed, 0 insertions, 0 deletions