diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-22 09:29:32 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-22 09:29:32 +0100 |
| commit | 23d40d5a2e0bd1d220b70a33fc63c22c7d7989ca (patch) | |
| tree | 4523a4e6e5f6a562391364f09aca47e6ec22af8b | |
| parent | 5cdbe6132f864d0453a9b6a25b6bc511ae48ffcd (diff) | |
| parent | 92720ed84d88d5cf96b958ae4e6ad134421804d0 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
Change-Id: I3d7d18f4dee2db6d5aa5f9afe40097cd5d88ce0d
0 files changed, 0 insertions, 0 deletions