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

..

coffeecatch

Add coffeecatch

2014-11-16 19:32:51 +11:00

mbgl

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

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