summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2018-02-18 20:32:27 +0100
committerLiang Qi <liang.qi@qt.io>2018-02-18 20:33:13 +0100
commitbe7e45ca259d70d5f2ef0d11460261146fc1df95 (patch)
tree772e0d4d6274fbe8cb4ffb16d833e3c448a29151
parentc4d27bc94a062779a17001ad69113d1bccdcbd57 (diff)
parent8bfa8a8ef3500744e1c26e1a82391186c44812ef (diff)
Merge remote-tracking branch 'origin/5.9' into 5.11v5.11.0-beta1
Conflicts: .qmake.conf Change-Id: Id472b54f56aa0e58095c50f896e3cb44c6124cd9
0 files changed, 0 insertions, 0 deletions