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
This commit is contained in:
1
test/fixtures/fixture_request.cpp
vendored
1
test/fixtures/fixture_request.cpp
vendored
@@ -4,6 +4,7 @@
|
||||
#include <mbgl/util/url.hpp>
|
||||
#include <mbgl/util/std.hpp>
|
||||
#include <mbgl/platform/log.hpp>
|
||||
#include <iostream>
|
||||
|
||||
#include <uv.h>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user