summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-07-31 03:02:32 +0200
committerEdward Welbourne <edward.welbourne@qt.io>2018-07-31 11:25:52 +0200
commit44c357ce531b06d7050ac9987c1ee8c1c470bd75 (patch)
treec02fc0d3b29d779aef72d362393f6221fce97829
parentad010c58de860bb6276ab13c81a4934f825e4b83 (diff)
parenta2d3d45f3e9f779a4fc10f8df07b9bd921e755c6 (diff)
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts: .qmake.conf Change-Id: I36836fda9e9da3f873a4797231e17f612466a2ce
0 files changed, 0 insertions, 0 deletions