diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-22 09:30:57 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-22 09:30:57 +0100 |
| commit | 225c62338c8af9e1ba0e49a965d00eb1d5a63cbd (patch) | |
| tree | a536145d014a6251c585a0ed038a7d57f877a6c5 | |
| parent | a4cf47ddfbfde719429ecd1c06bbb4b948cc9b9d (diff) | |
| parent | 59f4eed65ab9730162ddf5b1d5c1ac260024a361 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
Change-Id: I919bdc9279b711fe2daf2786bff9ff2f5f1d5edd
0 files changed, 0 insertions, 0 deletions