Brad Leege 044d1fc3c2 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into 1033-metrics ...

Conflicts:
	gyp/platform-ios.gypi
	platform/ios/MGLMapView.mm
	styles

2015-03-23 10:52:27 -05:00

..

MapboxGL.h

fixes #1053: umbrella Cocoa header

2015-03-22 12:25:10 -07:00

MGLAnnotation.h

Cocoa annotations API

2015-03-22 00:53:36 -07:00

MGLMapboxEvents.h

#1033 - Integrating MapboxEvents class.

2015-03-20 16:01:52 -05:00

MGLMapView.h

Cocoa annotations API

2015-03-22 00:53:36 -07:00

MGLMetricsLocationManager.h

#1033 - Removing BackgroundStatus analytic

2015-03-20 17:14:25 -05:00

MGLStyleFunctionValue.h

move iOS code from gl-cocoa to this project

2015-02-09 18:01:40 -08:00

MGLTypes.h

move iOS code from gl-cocoa to this project

2015-02-09 18:01:40 -08:00

NSArray+MGLAdditions.h

move iOS code from gl-cocoa to this project

2015-02-09 18:01:40 -08:00

NSDictionary+MGLAdditions.h

move iOS code from gl-cocoa to this project

2015-02-09 18:01:40 -08:00

UIColor+MGLAdditions.h

move iOS code from gl-cocoa to this project

2015-02-09 18:01:40 -08:00