diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-08 11:31:40 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-08 11:31:46 +0200 |
commit | 7191c267395a079eb6621198c219fc19ab79d3d5 (patch) | |
tree | c01d64c75754cdd5d648b78e4c4e5312f545ef4c /.qmake.conf | |
parent | 11c91568f342b226b8d34268bcf25d118779353d (diff) | |
parent | c2615a948ca8c4924d4de90eb4128ebe06581035 (diff) | |
download | qtsensors-7191c267395a079eb6621198c219fc19ab79d3d5.tar.gz |
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions