diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-01-18 12:47:02 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-01-18 12:47:02 +0100 |
| commit | 468e3c38a893b9293a9f0ede432ce54d72b46966 (patch) | |
| tree | 0d43bfb13247a0e5ed55152a70637c4c98b59a83 /dist | |
| parent | dcd89c6268f11c50a0833c41e5ab065aceb3c05f (diff) | |
| parent | 61afd66f148af4a8d3e0cad12b7c9419f1122cbe (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Change-Id: I6b8a6bdcc849b76a596d17d3b15e8e1efa58a28c
Diffstat (limited to 'dist')
| -rw-r--r-- | dist/changes-5.7.1 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dist/changes-5.7.1 b/dist/changes-5.7.1 index 2638ceac..e04fa837 100644 --- a/dist/changes-5.7.1 +++ b/dist/changes-5.7.1 @@ -56,12 +56,12 @@ Android This happened when SDP and BTLE scan revealed the same device with different names. -iOS/OS X +iOS/macOS --------- - Fixed potential linker error on iOS. - Added some minor code cleanups. - - Added support for iOS 10 and MacOSX10.12 SDK. + - Added support for iOS 10 and macOS 10.12 SDKs. Linux/Bluez ----------- |