summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md9
-rw-r--r--CONTRIBUTING.md10
-rw-r--r--INSTALL.md1
-rw-r--r--platform/osx/CHANGELOG.md4
4 files changed, 15 insertions, 9 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6b8572f54e..6ad2d51ad8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,8 @@
# Changelog
-As of iOS 3.2.0 and Android 4.0.0, we've split the CHANGELOG into platform specific CHANGELOGS to make it easier to follow the progress of a particular project. Their new locations are as follows:
+Each Mapbox GL Native SDK has a separate changelog that highlights changes relevant to their respective platforms:
-* Android --> [`/platform/android/CHANGELOG.md`](platform/android/CHANGELOG.md)
-* iOS --> [`/platform/ios/CHANGELOG.md`](platform/ios/CHANGELOG.md)
-* Node.js --> [`/platform/node/CHANGELOG.md`](platform/node/CHANGELOG.md)
+* [Mapbox Android SDK](platform/android/CHANGELOG.md)
+* [Mapbox iOS SDK](platform/ios/CHANGELOG.md)
+* [Mapbox OS X SDK](platform/osx/CHANGELOG.md)
+* [node-mapbox-gl-native](platform/node/CHANGELOG.md)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 8fd87f8dfd..0df51bd174 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -9,12 +9,12 @@ If you want to contribute code:
1. Ensure that existing [pull requests](https://github.com/mapbox/mapbox-gl-native/pulls) and [issues](https://github.com/mapbox/mapbox-gl-native/issues) don’t already cover your contribution or question.
1. Pull requests are 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(s):
- - [iOS](platform/ios/CHANGELOG.md)
- - [Android](platform/android/CHANGELOG.md)
- - [Node.js](platform/node/CHANGELOG.md)
- - Other platforms, look in: `/platform/{platform-name}/CHANGELOG.md`
+ * [Mapbox Android SDK](platform/android/CHANGELOG.md)
+ * [Mapbox iOS SDK](platform/ios/CHANGELOG.md)
+ * [Mapbox OS X SDK](platform/osx/CHANGELOG.md)
+ * [node-mapbox-gl-native](platform/node/CHANGELOG.md)
-1. Prefix your commit messages with the platform(s) your changes affect: `[core]`, `[ios]`, `[android]`, `[node]`, and so on.
+1. Prefix your commit messages with the platform(s) your changes affect: `[core]`, `[android]`, `[ios]`, `[osx]`, `[node]`, or `[qt]`.
# Code of conduct
Everyone is invited to participate in Mapbox’s open source projects and public discussions: we want to create a welcoming and friendly environment. Harassment of participants or other unethical and unprofessional behavior will not be tolerated in our spaces. The [Contributor Covenant](http://contributor-covenant.org) applies to all projects under the Mapbox organization and we ask that you please read [the full text](http://contributor-covenant.org/version/1/2/0/).
diff --git a/INSTALL.md b/INSTALL.md
index f46e2e4232..0cefe07592 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -57,5 +57,6 @@ See the relevant SDK documentation for next steps:
* [Mapbox Android SDK](platform/android/)
* [Mapbox iOS SDK](platform/ios/)
* [Mapbox OS X SDK](platform/osx/)
+* [Mapbox Qt SDK](platform/qt/)
* [Mapbox GL Native on Linux](platform/linux/)
* [node-mapbox-gl-native](platform/node/)
diff --git a/platform/osx/CHANGELOG.md b/platform/osx/CHANGELOG.md
index a22f89bca6..cc62d3d037 100644
--- a/platform/osx/CHANGELOG.md
+++ b/platform/osx/CHANGELOG.md
@@ -1,5 +1,9 @@
# Changelog for Mapbox OS X SDK
+## master
+
+* Fixed an issue in which Mapbox.framework was nested inside another folder named Mapbox.framework. ([#4998](https://github.com/mapbox/mapbox-gl-native/pull/4998))
+
## 0.1.0
* This version of the Mapbox OS X SDK roughly corresponds to version 3.3.0-alpha.2 of the Mapbox iOS SDK. The two SDKs have very similar feature sets. The main difference is the lack of user location tracking. Some APIs have been adapted to OS X conventions, particularly the use of NSPopover for callout views.