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

Conflicts:
	gyp/mbgl-ios.gypi
	gyp/mbgl-osx.gypi
	platform/default/asset_request_libuv.cpp
	src/mbgl/storage/caching_http_file_source.cpp
	src/mbgl/storage/file_request.cpp
	src/mbgl/storage/file_request.hpp
	src/mbgl/storage/file_request_baton.hpp

2014-12-18 12:39:36 +11: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

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

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