diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-27 16:38:07 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-27 16:38:07 +0200 |
| commit | 496e66fde8658f3c38a828a4e4eb96516aa611c8 (patch) | |
| tree | 4188f8150bfc6aee6e5c6edcef5e028b256fc776 /dist/changes-5.13.0 | |
| parent | 136f7679d066f7318b84795ca4fbc8857315a3ef (diff) | |
| parent | bb5b7fd2e3fc365ec746d7e756556d410c5841d8 (diff) | |
| download | qtx11extras-496e66fde8658f3c38a828a4e4eb96516aa611c8.tar.gz | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
Change-Id: Ic9209322e9471e7e6b50b8482435dae5cd0aa249
Diffstat (limited to 'dist/changes-5.13.0')
0 files changed, 0 insertions, 0 deletions