Merge remote-tracking branch 'mapbox/master' into 2317-espresso

2015-09-15 15:38:28 -04:00
parent f3e4d3238b 8c177e8b2b
commit c002c33c5c
2 changed files with 5 additions and 1 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog

+## iOS 2.1.1
+
+- Fixes for Xcode 7 and Bitcode. ([#2238](https://github.com/mapbox/mapbox-gl-native/pull/2238))
+
 ## iOS 2.1.0

 - A two-finger vertical swipe now tilts the map into perspective mode. ([#2116](https://github.com/mapbox/mapbox-gl-native/pull/2116))
--- a/ios/Mapbox-iOS-SDK.podspec
+++ b/ios/Mapbox-iOS-SDK.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |m|

  m.name    = 'Mapbox-iOS-SDK'
-  m.version = '2.1.0'
+  m.version = '2.1.1-symbols'

  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.'