diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-22 03:03:52 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-22 03:03:52 +0200 |
| commit | b79319d0681802cac656c487b268fbf60ce5a57d (patch) | |
| tree | cf4826473c6b661ad24821b493ce6badcc753865 /.qmake.conf | |
| parent | d82611117940a7493c41b72fdf77a569a348e325 (diff) | |
| parent | ceebd297c3e4365940469347208e5f22b764d6a3 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I6c9bf4e3cebdd3b8d41bf15ca7f776225993f871
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions