summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2018-01-18 21:54:24 +0100
committerLiang Qi <liang.qi@qt.io>2018-01-18 21:54:24 +0100
commit8f4f2e0cae642ff5eb0b87ae1d4e9c5e6ccf2bd8 (patch)
treeb6c8c56cab52241d2428a0aeceda7061ac1cd337
parentcd3d1278f012b8f6b259305fd06006be7f825c99 (diff)
parenteee494c12a70fa0aa6fce427f47f44ff60281dca (diff)
Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.15.10
Conflicts: .qmake.conf Change-Id: I967987aa49ae367010b2fa1247f79827c6eb911c
0 files changed, 0 insertions, 0 deletions