Konstantin Käfer
|
9a549094e0
|
make ios compile
|
2015-02-04 10:49:06 +01:00 |
|
Konstantin Käfer
|
92a7f73bbe
|
fixes for linux
|
2015-02-04 10:49:06 +01:00 |
|
Konstantin Käfer
|
b9bf66e67e
|
rewrite storage layer to be independent of the Map's event loop
|
2015-02-04 10:46:37 +01:00 |
|
Leith Bade
|
1dd3ad8e64
|
Fix build
|
2014-12-18 20:35:55 +11:00 |
|
Leith Bade
|
f73eebe47c
|
Add run to AssetRequest
|
2014-12-18 18:41:44 +11:00 |
|
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 |
|
Konstantin Käfer
|
b5e9998b15
|
change file:// to asset:// to indicate that they aren't arbitrary files
refs #579
|
2014-12-17 14:59:05 +01:00 |
|