Leith Bade df19683b6a Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason ...

Conflicts:
	Makefile
	platform/default/headless_view.cpp
	src/mbgl/map/map.cpp

2014-12-21 15:02:47 +13:00

..

android

Add Android user-agent info

2014-12-10 19:14:05 +11:00

map

Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason

2014-12-21 15:02:47 +13:00

platform

Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason

2014-12-18 12:39:36 +11:00

storage

Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason

2014-12-18 12:39:36 +11:00

util

Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason

2014-12-10 19:13:21 +11:00

mbgl.hpp

rename llmr => mbgl

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