summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMinh Nguyễn <mxn@1ec5.org>2015-09-30 12:38:26 -0700
committerMinh Nguyễn <mxn@1ec5.org>2015-10-07 10:19:19 -0700
commit456f3297557196899c2ebde364a701b1ede19299 (patch)
tree44caedbf742b799b60037bc8ea5fef720beac770
parent3a1f62e6b9e1e204dde3dd3cf3736cebc1ac0f45 (diff)
downloadqtlocation-mapboxgl-456f3297557196899c2ebde364a701b1ede19299.tar.gz
Ask contributors to update changelogs incrementally
Also seeded the changelog with changes in master.
-rw-r--r--CHANGELOG.md7
-rw-r--r--CONTRIBUTING.md3
-rw-r--r--platform/node/CHANGELOG.md2
3 files changed, 10 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f2a33b100e..380003052b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
# Changelog
+## iOS master
+
+- The SDK now builds with Bitcode enabled. ([#2332](https://github.com/mapbox/mapbox-gl-native/issues/2332))
+- The double-tap-drag gesture for zooming in and out is now consistent with the Google Maps SDK. ([#2153](https://github.com/mapbox/mapbox-gl-native/pull/2153))
+- A new `MGLAnnotationImage.enabled` property allows you to disable touch events on individual annotations. ([#2501](https://github.com/mapbox/mapbox-gl-native/pull/2501))
+- Fixed a rendering issue with styles that use the `background-pattern` property. ([#2531](https://github.com/mapbox/mapbox-gl-native/pull/2531))
+
## iOS 2.1.2
- Built with Xcode 6.4 to not yet trigger Bitcode compatibility until Xcode 7 stabilizes. ([#2332](https://github.com/mapbox/mapbox-gl-native/issues/2332))
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3e6e8db7ca..6020ae4e39 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -8,7 +8,6 @@ If you want to contribute code:
1. Ensure that the [existing issues](https://github.com/mapbox/mapbox-gl-native/issues?utf8=✓&q=) don't already cover your question or contribution.
-1. Pull requests gladly accepted.
+1. Pull requests gladly accepted. If there are any changes that developers using one of the GL SDKs should be aware of, please update the “master” section of the relevant changelog: [iOS](CHANGELOG.md) [Node.js](platform/node/CHANGELOG.md).
1. Prefix your commit messages with the platform(s) your changes affect: `[core]`, `[ios]`, `[android]`, `[node]`, and so on.
-
diff --git a/platform/node/CHANGELOG.md b/platform/node/CHANGELOG.md
index 937f538c0e..55012622ca 100644
--- a/platform/node/CHANGELOG.md
+++ b/platform/node/CHANGELOG.md
@@ -1,3 +1,5 @@
+# master
+
# 2.0.0
- Integrates Node.js bindings into core mapbox-gl-native project. ([#2179](https://github.com/mapbox/mapbox-gl-native/pull/2179))