summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-03-27 10:28:14 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-03-27 10:28:14 +0100
commit7dc2d9302347b87993f5cfed4be5d6b9c3e130bc (patch)
tree3131fc4d1e6c9a587b01067929b0051ae2b499dd
parentf171e624934ffa6d79c1eb9c9134a8ecf2101a7e (diff)
parentc71ab9ebe8cad26169466a7bfd0c7a239d43ea3c (diff)
Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta3v5.13.0-beta2
Conflicts: .qmake.conf Change-Id: I74c21ff111662ab85eae42aa50e0b6a724413898
0 files changed, 0 insertions, 0 deletions