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

..

android

fixes black flicker on rotating the device

2015-03-12 12:16:38 +01:00

ios

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

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

map

move style classes to MapData object and make thread safe

2015-03-23 11:02:21 +01:00

platform

Log the Environment ID and the Thread name

2015-03-18 12:51:33 +01:00

storage

fix rare issue that had the notify and cancel callbacks called in the wrong order

2015-03-13 15:30:10 +01:00

util

Cocoa annotations API

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

mbgl.hpp

rename llmr => mbgl

2014-07-16 18:53:56 -07:00