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

..

android

fixes black flicker on rotating the device

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

ios

#1033 - Flush all events to server when app enters background

2015-03-24 10:02:13 -05:00

map

annotations perf improvements & iOS app testing

2015-03-23 20:49:02 -07: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

Merge branch 'master' into 1022-annotations-thread-safety

2015-03-23 11:13:51 -07:00

mbgl.hpp

rename llmr => mbgl

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