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

Conflicts:
	platform/ios/MGLMapView.mm

2015-03-24 15:15:27 -05:00

..

resources

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

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

MGLMapboxEvents.m

#1033 - Building Mapbox Metrics Disabled UI in Settings.app and functionality in Events tracking infrastructure

2015-03-24 11:33:08 -05:00

MGLMapView.mm

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

2015-03-24 15:15:27 -05:00

MGLMetricsLocationManager.m

#1033 - Adding TODO to location where Opt Out and Metrics Disabled Checking will be implemented.

2015-03-23 11:29:34 -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