diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-02 13:47:46 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-02 13:47:46 +0200 |
commit | 81a8a8771f987ebfefbffc1a7a4003cbf0a1760d (patch) | |
tree | c681a0112ef42a6a81bc9215d598b4a6838b3554 /src/bluetooth/osx/osxbtledeviceinquiry.mm | |
parent | caef6445a95dd1941fdf583f09407e1e32b11249 (diff) | |
parent | 869547fc4fb4b94e97c81989cf85da85d588328b (diff) |
Merge remote-tracking branch 'origin/5.5' into 5.6
Change-Id: I0f261e312e052855a47a3985b62c40c2f0338119
Diffstat (limited to 'src/bluetooth/osx/osxbtledeviceinquiry.mm')
0 files changed, 0 insertions, 0 deletions