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

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

2014-12-23 11:33:26 +13:00

..

android

Rename lots of things

2014-12-04 01:10:43 +11:00

darwin

restructure gyp files

2014-10-24 16:40:08 +02:00

default

Rename View functions to match conventions. Also tidy up view classes and remove C style casts. Closes #656

2014-12-23 09:29:45 +13:00

event.hpp

Fix typo

2014-11-30 19:46:43 +11:00

gl.hpp

Add missing CHECK_ERROR

2014-12-11 00:14:46 +11:00

log.hpp

remove usage of relative paths

2014-12-04 20:02:51 +01:00

platform.hpp

change file:// to asset:// to indicate that they aren't arbitrary files

2014-12-17 14:59:05 +01:00