diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-15 03:03:55 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-15 03:03:55 +0200 |
| commit | 3559ba1239d5c3f883b91ea48b22cc4c6ea2feb7 (patch) | |
| tree | dd44b390c41a9ccfbc952e82f71769be1e7c8e52 /.qmake.conf | |
| parent | 563a68dbec90f5027c00c179a350b239ce67381d (diff) | |
| parent | 467eacf0a0379356ea99f53c1300f07261d1664c (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I2ceddd2df3ebe455094549807f7eeee5ee211865
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions