summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-07-31 03:01:22 +0200
committerEdward Welbourne <edward.welbourne@qt.io>2018-07-31 10:52:11 +0200
commit44a28955dc8090dc8e9fa59e57c664e78d24be5e (patch)
tree25dc18b0d7b0624fcaa9f7bdcce79f77e18c5bc1
parent6078bd1b060d2e315e251357573b2eb3b00c129f (diff)
parentda2c33386d4c55638c5d2d797ea416562e98d3cb (diff)
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts: .qmake.conf Change-Id: I70fe649d43480b38930d04490aa74c4c842fc4cd
0 files changed, 0 insertions, 0 deletions