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