diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-27 10:30:08 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-27 10:30:09 +0100 |
| commit | 7bfd9ae91ff801ae6b36d3fe7563bcb2781c5e01 (patch) | |
| tree | 6bf7b4e8caa9bbb9287088368db1d7a98097ba5a /src/bluetooth/qlowenergycontroller_winrt_new.cpp | |
| parent | 6f442044a17ae8c2acb201ba8c9eb1a8cb452899 (diff) | |
| parent | d21da7829811d129b96ca0eb2a56cb6bdae4f1a7 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
Change-Id: Id7c4409314c2ad5daf5bc9860befe096a2384849
Diffstat (limited to 'src/bluetooth/qlowenergycontroller_winrt_new.cpp')
0 files changed, 0 insertions, 0 deletions