summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKari Oikarinen <kari.oikarinen@qt.io>2019-09-04 12:04:28 +0300
committerKari Oikarinen <kari.oikarinen@qt.io>2019-09-04 12:04:28 +0300
commit304466e54d780d5349dde6f7db3e6da6c7c2a54f (patch)
tree181ce6466bbb42a054dd3893de5174cb38b22cc7
parent8388555ffb1da9cd5e714dfba6545736e6e2b496 (diff)
parent90cc2fb3fa971716e2f1edb5dd71936c61bae1cd (diff)
Merge dev into 5.14 (delayed final downmerge)
This replicates the effects of the fast-forward merge that should have been pushed on 2019-08-27 as the final down-merge from dev to 5.14. Task-number: QTBUG-78019 Change-Id: I9351e5817364a7897d8521074cbae8cfe138deb3
0 files changed, 0 insertions, 0 deletions