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

..

mbgl

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

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