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

Conflicts:
	include/mbgl/platform/default/headless_view.hpp
	platform/default/glfw_view.cpp
	platform/default/headless_view.cpp

2014-12-10 19:22:25 +11: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-08 20:19:41 +11:00

platform

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

2014-12-10 19:22:25 +11:00

storage

Fix commit

2014-12-06 00:50:23 +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