summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-01-22 09:29:58 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-01-22 09:29:58 +0100
commit2d83e09f9d6ca4d604571d7989a359381e6c93ff (patch)
treed68389458b18a13adf77a94134dfb3d81adc4688
parent7545237546f620d09d37f30cb74d18083b868e54 (diff)
parentf167b3cdb61a0bd51360d9736f23e99e5ae0c860 (diff)
Merge remote-tracking branch 'origin/5.12' into devv5.13.0-alpha1
Conflicts: .qmake.conf Change-Id: I071a98189a8f8a1b5f2bea28bc6cd407c82d5c18
0 files changed, 0 insertions, 0 deletions