summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-11-05 07:30:58 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-11-05 07:30:58 +0100
commita3506e293dd4a762764554b2792c2209d0e409c7 (patch)
treea9637cca9076b3401d8185b6f09e853a7f1d1d98
parentcd667a4ea78ec3eba9170f2d03d9a3bf22dc7365 (diff)
parentb4588093a5a32d12700afa9e0f0ff54df57ffd66 (diff)
Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta3
Conflicts: .qmake.conf Change-Id: Ifcd9b2701c091103e316ed94010540dda70c79fa
0 files changed, 0 insertions, 0 deletions