Merge remote-tracking branch 'origin/5.7' into 5.8

Change-Id: I6b8a6bdcc849b76a596d17d3b15e8e1efa58a28c
2017-01-18 12:47:02 +01:00 · 2017-01-18 12:47:02 +01:00 · 468e3c38a8
parent dcd89c6268 61afd66f14
commit 468e3c38a8
1 changed files with 2 additions and 2 deletions
--- 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
 -----------