diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-10 21:35:33 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-10 21:35:33 +0100 |
| commit | 37233436a5d01405dc93ebcfc90cb1a77ce206c1 (patch) | |
| tree | a072cc22c848b4631978d848edf1c99765c371c5 | |
| parent | 57691296b76125e7dbec26e56d9ccc73da78d1c3 (diff) | |
| parent | 450f932762eef448081a22e98fa93a191bd9a804 (diff) | |
| download | qtsensors-37233436a5d01405dc93ebcfc90cb1a77ce206c1.tar.gz | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
Change-Id: I42e2c7b43af8f2c96b8c2199b134bd2ca46221f8
0 files changed, 0 insertions, 0 deletions