Leith Bade
|
20584a57dd
|
Fix debug build
|
2014-12-04 23:21:23 +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 |
|
Leith Bade
|
08ce7157f1
|
Fix debug build
|
2014-12-03 22:58:33 +11:00 |
|
Leith Bade
|
94d34ce7ac
|
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts:
src/map/map.cpp
|
2014-12-03 22:02:55 +11:00 |
|
Leith Bade
|
f090d6b264
|
Use uv::async and various other fixes
|
2014-12-03 21:57:55 +11:00 |
|
Konstantin Käfer
|
82f3574d09
|
add array overloads to make_unique and move it to mbgl::util from std
|
2014-12-03 11:27:24 +01:00 |
|
Leith Bade
|
f0e4e27cd3
|
Read styles from APK
|
2014-11-17 23:17:22 +11:00 |
|
Konstantin Käfer
|
74387c54e3
|
add missing include header
|
2014-10-22 16:37:59 +02:00 |
|
Konstantin Käfer
|
02e88e445d
|
fixes for libuv 0.11
|
2014-10-22 15:29:28 +02:00 |
|
Konstantin Käfer
|
905c4294be
|
Merge branch 'libuv-0.10-headless-display' into mason
Conflicts:
common/http_request_baton_curl.cpp
include/mbgl/map/map.hpp
include/mbgl/util/uv_detail.hpp
scripts/travis_before_install.sh
setup-libraries.sh
src/map/map.cpp
src/storage/file_request_baton.cpp
src/storage/http_request.cpp
src/util/uv-messenger.c
|
2014-10-22 15:14:21 +02:00 |
|
Konstantin Käfer
|
3a39d69504
|
link boost when the boost variable is set
|
2014-10-22 10:45:50 +02:00 |
|
Konstantin Käfer
|
5a87fb337d
|
first attempt at using mason to install packages
[skip ci]
|
2014-10-20 17:55:49 +02:00 |
|
Mike Morris
|
ee68c091a8
|
adjust file_request_baton and http_request for libuv 0.10 api
|
2014-10-10 13:25:26 -04:00 |
|
Konstantin Käfer
|
a9039cf5d7
|
move file request baton to its own file
|
2014-09-30 17:29:09 +02:00 |
|