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

..

resources

Merge pull request #950 from friedbunny/3x-assets

2015-03-05 20:01:00 -08:00

MGLMapboxEvents.m

#1033 - Integrating MapboxEvents class.

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

MGLMapView.mm

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

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

MGLMetricsLocationManager.m

#1033 - Removing BackgroundStatus analytic

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

MGLStyleFunctionValue.m

move iOS code from gl-cocoa to this project

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

MGLTypes.m

move iOS code from gl-cocoa to this project

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

NSArray+MGLAdditions.m

move iOS code from gl-cocoa to this project

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

NSDictionary+MGLAdditions.m

move iOS code from gl-cocoa to this project

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

UIColor+MGLAdditions.m

move iOS code from gl-cocoa to this project

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