diff options
author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-08-24 19:54:10 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-08-24 19:54:10 +0200 |
commit | 71524c78f60d6a5b3d4c4efc3c277bc8eae1f400 (patch) | |
tree | d4792915f7191492ac0bf3e4b842fe530de98bf6 /qtwebkit | |
parent | 7efeb26af74105d53538f095ff1d1cab3f4398ee (diff) | |
parent | b78f3579aff5032768f2c9f12b0f128e670d34d7 (diff) |
Merge remote-tracking branch 'origin/dev' into 5.8
Note that this also contains the adjustment of the branch for the
latecomers qtspeech and qtnetworkauth.
Change-Id: Ia77eb4d47a6ad66cb35e50ae03af751f46a805a8
Diffstat (limited to 'qtwebkit')
0 files changed, 0 insertions, 0 deletions