summaryrefslogtreecommitdiff
path: root/platform/macos/CHANGELOG.md
diff options
context:
space:
mode:
authorTobrun <tobrun.van.nuland@gmail.com>2017-11-10 06:16:35 +0100
committerTobrun <tobrun.van.nuland@gmail.com>2017-11-10 06:16:35 +0100
commit225fba8a0aad5ea52ff878443f58d65bb2221d74 (patch)
tree8fef9e5353ec33f2fc0cec378a77d7146f9c67d0 /platform/macos/CHANGELOG.md
parent6b5afaab7611cc59c86f749fd9130edb512b4945 (diff)
parent91dabd01dfcd52dc40aa1c1d1db9d3f48f7abc97 (diff)
downloadqtlocation-mapboxgl-225fba8a0aad5ea52ff878443f58d65bb2221d74.tar.gz
Merge branch 'release-agua' into tvn-merge-release
Diffstat (limited to 'platform/macos/CHANGELOG.md')
-rw-r--r--platform/macos/CHANGELOG.md8
1 files changed, 7 insertions, 1 deletions
diff --git a/platform/macos/CHANGELOG.md b/platform/macos/CHANGELOG.md
index 31b3540a7c..cad254e670 100644
--- a/platform/macos/CHANGELOG.md
+++ b/platform/macos/CHANGELOG.md
@@ -1,6 +1,6 @@
# Changelog for Mapbox macOS SDK
-## master
+## v0.6.0
### Networking and storage
@@ -27,9 +27,15 @@
* Increased the default maximum zoom level from 20 to 22. ([#9835](https://github.com/mapbox/mapbox-gl-native/pull/9835))
* Added an `overlays` property to `MGLMapView`. ([#8617](https://github.com/mapbox/mapbox-gl-native/pull/8617))
* Added `-[MGLMapView cameraThatFitsShape:direction:edgePadding:]` to get a camera with zoom level and center coordinate computed to fit a shape. ([#10107](https://github.com/mapbox/mapbox-gl-native/pull/10107))
+<<<<<<< HEAD
+=======
+* Added support selection of shape and polyline annotations.([#9984](https://github.com/mapbox/mapbox-gl-native/pull/9984))
+* Fixed an issue where a shape annotation callout was not displayed if the centroid was not visible. ([#10255](https://github.com/mapbox/mapbox-gl-native/pull/10255))
+>>>>>>> release-agua
### Other changes
+* Added a Bulgarian localization. ([#10309](https://github.com/mapbox/mapbox-gl-native/pull/10309))
* Fixed an issue that could cause line label rendering glitches when the line geometry is projected to a point behind the plane of the camera. ([#9865](https://github.com/mapbox/mapbox-gl-native/pull/9865))
* Fixed an issue that could cause a crash when using `-[MGLMapView flyToCamera:completionHandler:]` and related methods with zoom levels at or near the maximum value. ([#9381](https://github.com/mapbox/mapbox-gl-native/pull/9381))