diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-06 03:00:21 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-06 03:00:21 +0200 |
| commit | 29b1b9654ac51d5cd4d77d0b5a350cbca604abfd (patch) | |
| tree | 502a688e5a66cb0678a1f1e348afb3bfcb5549e0 /.qmake.conf | |
| parent | e76c7140d3c0a7dabcc6eb0adb3db551d07dbf1f (diff) | |
| parent | 12d9593daeb8ffc7e50d068923afaf848083dcd4 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: Ide3baa0f89b9e43b2905f283077cf8fe018661cc
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions