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
|
1da471abba
|
curl fixes
[skip ci]
|
2014-10-20 18:21:21 +02:00 |
|
Mike Morris
|
6e8e50e371
|
call on_timeout with status 0 (success)
|
2014-10-10 14:47:33 -04:00 |
|
Mike Morris
|
35f2c7fe23
|
switch http_request_baton_curl to libuv 0.10 api
|
2014-10-10 14:37:10 -04:00 |
|
Konstantin Käfer
|
5c6863c540
|
add missing include
|
2014-09-29 08:10:31 -07:00 |
|
Konstantin Käfer
|
b9628c8654
|
add etag support and if-none-match/if-modified-since to cocoa http handling
|
2014-09-26 16:10:39 +02:00 |
|
Konstantin Käfer
|
992d9ff051
|
add back CURL requesting
|
2014-09-24 16:19:47 +02:00 |
|