summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2018-02-18 20:11:28 (GMT)
committerLiang Qi <liang.qi@qt.io>2018-02-18 20:12:09 (GMT)
commit78a10dad08d1c354f7afb539bd89f0d75a9fe3b1 (patch)
tree2147a2a53de3cf35ad9e6713f443983562d1404e
parent8c57d6220db57866a1c7cc35ac6f902225c28095 (diff)
parentdef0ad5122a4549b903736fa7a8cc68d936ad3f3 (diff)
downloadqtx11extras-78a10dad08d1c354f7afb539bd89f0d75a9fe3b1.tar.gz
Merge remote-tracking branch 'origin/5.9' into 5.11v5.11.0-beta1
Conflicts: .qmake.conf Change-Id: I2a5ab4ebc65b26af8424dbf6b2e99a096704491f
0 files changed, 0 insertions, 0 deletions