aboutsummaryrefslogtreecommitdiffstats
path: root/qtbase
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@qt.io>2018-01-29 13:34:28 +0100
committerFrederik Gladhorn <frederik.gladhorn@qt.io>2018-01-29 13:34:28 +0100
commit485244b016172445aa20bd31fb84fec6b7724cf5 (patch)
treecf2a40fea5517379e56e624bcb27936873546f1e /qtbase
parent3504be0d83cdfb565ee5e3c043c33c54dacbfa54 (diff)
parent00e31823d35eecfa6ee265b1ccdb563dfe1b905f (diff)
Merge remote-tracking branch 'origin/5.9' into 5.10.1
This was pushed directly, bypassing codereview.qt-project.org to get provisioning back into a working state. Change-Id: Ia5d2e6f7079162f571cd7c7994c0f2b3133b1163 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'qtbase')
0 files changed, 0 insertions, 0 deletions