diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-04-14 12:25:15 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-04-14 12:25:15 +0200 |
commit | aa800943436bcfda2785106c6491023c56bafd7f (patch) | |
tree | e74f80de4c77028b4bbf13a955c24d52209ea121 /.qmake.conf | |
parent | dd4329e7bcd455c35bd57ecce7dd2011b8f137eb (diff) | |
parent | 98e65d35112183bb608f14b3166637ada48c041c (diff) | |
download | qtscript-aa800943436bcfda2785106c6491023c56bafd7f.tar.gz |
Merge remote-tracking branch 'origin/5.12.8' into 5.12
Change-Id: I2f78569e657210c1a180a602c8fc6b0ef3ec846b
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions