summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin R. Miller <incanus@codesorcery.net>2015-05-15 15:15:22 -0700
committerJustin R. Miller <incanus@codesorcery.net>2015-05-15 15:15:22 -0700
commit5ab27fd65a9a3203896560596ee8a2e50dd8aa13 (patch)
tree26d48e072efb295839b36657de1c96c76633b60e
parent83a5aae6c55d72949c07adf555c52ca751857edc (diff)
parente20ef135f1d9a72514f2d093faabb50f7209f6f2 (diff)
downloadqtlocation-mapboxgl-5ab27fd65a9a3203896560596ee8a2e50dd8aa13.tar.gz
Merge branch 'ios-b1'
-rw-r--r--include/mbgl/ios/MGLMapView.h1
-rw-r--r--ios/MapboxGL.podspec3
-rw-r--r--ios/README.md2
3 files changed, 4 insertions, 2 deletions
diff --git a/include/mbgl/ios/MGLMapView.h b/include/mbgl/ios/MGLMapView.h
index 9d7b5c9019..e21c74390f 100644
--- a/include/mbgl/ios/MGLMapView.h
+++ b/include/mbgl/ios/MGLMapView.h
@@ -13,7 +13,6 @@
* Use of MGLMapView requires a Mapbox API access token. Obtain an access token on the [Mapbox account page](https://www.mapbox.com/account/apps/). If you instantiate an MGLMapView from Interface Builder, rendering of the map won't begin until the accessToken property has been set.
*
* @warning Please note that you are responsible for getting permission to use the map data, and for ensuring your use adheres to the relevant terms of use. */
-IB_DESIGNABLE
@interface MGLMapView : UIView
#pragma mark - Initializing a Map View
diff --git a/ios/MapboxGL.podspec b/ios/MapboxGL.podspec
index 6ee2fd9669..67bcc95710 100644
--- a/ios/MapboxGL.podspec
+++ b/ios/MapboxGL.podspec
@@ -1,7 +1,7 @@
Pod::Spec.new do |m|
m.name = 'MapboxGL'
- m.version = '0.3.0'
+ m.version = '0.3.1'
m.summary = 'Open source vector map solution for iOS with full styling capabilities.'
m.description = 'Open source OpenGL-based vector map solution for iOS with full styling capabilities and Cocoa bindings.'
@@ -10,6 +10,7 @@ Pod::Spec.new do |m|
m.author = { 'Mapbox' => 'mobile@mapbox.com' }
m.screenshot = 'https://raw.githubusercontent.com/mapbox/mapbox-gl-native/master/ios/screenshot.png'
m.social_media_url = 'https://twitter.com/mapbox'
+ m.documentation_url = 'https://www.mapbox.com/mapbox-gl-ios'
m.source = {
:http => "http://mapbox.s3.amazonaws.com/mapbox-gl-native/ios/builds/mapbox-gl-ios-#{m.version.to_s}.zip",
diff --git a/ios/README.md b/ios/README.md
index 169da5ff89..4c387f322f 100644
--- a/ios/README.md
+++ b/ios/README.md
@@ -3,3 +3,5 @@
An open source OpenGL-based vector map solution for iOS with full styling capabilities and Cocoa bindings.
For more information, check out [our online overview](https://www.mapbox.com/mapbox-gl-ios/).
+
+![](https://raw.githubusercontent.com/mapbox/mapbox-gl-native/master/ios/screenshot.png)