diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-26 11:52:21 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-26 11:52:21 +0200 |
commit | 5755e89a9de6c60ac574759bc820a7b915b9ee62 (patch) | |
tree | 82581221aa6149a7f5c194cbd50d17f609641e61 /.qmake.conf | |
parent | 6fe5ab95cc0f05f4c3e5ab925ac7d0b64e4ca52f (diff) | |
parent | a4b7814ec945b979bafdc6de60800bbddd4d240e (diff) | |
download | qtsensors-5755e89a9de6c60ac574759bc820a7b915b9ee62.tar.gz |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I580be02701e5e4b5a57f59206d6a50cc98ddf220
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions