Leith Bade
|
1c0396690e
|
Fixup after merge
|
2014-12-04 22:39:38 +11:00 |
|
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 |
|
John Firebaugh
|
57249ca32c
|
Prefer stdlib to libuv (fixes #688)
|
2014-12-03 17:38:10 -08:00 |
|
John Firebaugh
|
10ebcbca93
|
Remove unused
|
2014-12-03 13:42:02 -08:00 |
|
Mike Morris
|
e87a6d1871
|
Merge branch 'master' into android-mason
Conflicts:
gyp/mbgl-ios.gypi
gyp/mbgl-linux.gypi
gyp/mbgl-osx.gypi
platform/default/caching_http_file_source.cpp
|
2014-12-03 13:07:49 -05:00 |
|
Mike Morris
|
dac76a0f92
|
break out FileSource as an abstract class
add CachingHTTPFileSource implementation
|
2014-12-03 12:25:11 -05:00 |
|