aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-06-04 16:11:27 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-06-04 16:11:27 +0200
commitf0a5e0f823189b26959027211d9f7170a17a3020 (patch)
tree6370dc3577ad76e06789b3b5796c2ca2539e9a98
parent90b2f9b75f9420fe6baff01a11751737ae5f2c80 (diff)
parent8f704eeb002ef492697daa2202a39f8001aecdc9 (diff)
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts: .qmake.conf Change-Id: I5c0e3a7ba0933c15d1338d8de452b5c9cb61ae1a
0 files changed, 0 insertions, 0 deletions