diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-10 21:36:43 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-10 21:36:43 +0100 |
commit | 3ea03029664273be39c7fb5f72330c1a93387416 (patch) | |
tree | da8b9df256104e59f5fbeb3db24691e2d935d116 | |
parent | 9c9054369147cab72f07735f453af9ee362ebc6f (diff) | |
parent | c3f2f14d64c8301cdce8b1a9b383ca8eaaec6406 (diff) | |
download | qtx11extras-3ea03029664273be39c7fb5f72330c1a93387416.tar.gz |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
Change-Id: I95b6b6364e8d9f45b77cdd4362951685b261db2e
0 files changed, 0 insertions, 0 deletions