Leith Bade
8f1754cf0a
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts:
include/mbgl/storage/base_request.hpp
include/mbgl/storage/file_request_baton.hpp
include/mbgl/storage/http_request.hpp
include/mbgl/storage/http_request_baton.hpp
include/mbgl/util/uv_detail.hpp
platform/darwin/http_request_baton_cocoa.mm
platform/default/caching_http_file_source.cpp
platform/default/http_request_baton_curl.cpp
src/map/map.cpp
src/storage/base_request.cpp
src/storage/file_request.cpp
src/storage/file_request_baton.cpp
src/storage/http_request.cpp
src/storage/http_request_baton.cpp
2014-12-04 22:19:46 +11:00
..
2014-12-03 22:58:33 +11:00
2014-10-24 16:40:08 +02:00
2014-12-04 22:19:46 +11:00
2014-12-03 23:03:14 +11:00
2014-11-10 15:06:56 -05:00
2014-12-04 01:10:43 +11:00
2014-12-04 22:19:46 +11:00
2014-12-03 11:27:24 +01:00
2014-12-03 22:02:55 +11:00
2014-11-28 00:15:04 +11:00
2014-10-24 16:40:08 +02:00
2014-11-28 00:15:05 +11:00
2014-10-24 16:40:08 +02:00
2014-11-27 18:11:18 +01:00