Konstantin Käfer
|
087d04292a
|
Merge branch 'master' of github.com:mapbox/mapbox-gl-native
|
2014-10-22 15:18:30 +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
|
253bbd1c5b
|
New mason-based build system
|
2014-10-22 15:13:35 +02:00 |
|
Konstantin Käfer
|
2f3952b305
|
fix compile warnings
|
2014-10-22 11:00:34 +02:00 |
|
John Firebaugh
|
4e9688e430
|
Fix compiler warnings
|
2014-10-17 11:12:31 -07:00 |
|
Mike Morris
|
2d1219fa51
|
Merge branch 'master' into libuv-0.10-headless-display
Conflicts:
common/curl_request.cpp
common/glfw_view.cpp
common/glfw_view.hpp
include/mbgl/platform/request.hpp
ios/mapbox-gl-cocoa
setup-libraries.sh
src/map/map.cpp
src/platform/request.cpp
test/fixtures/fixture_request.cpp
|
2014-10-10 12:24:45 -04:00 |
|
Konstantin Käfer
|
8fcc74e253
|
fix headless tests
|
2014-09-30 17:29:10 +02:00 |
|
Mike Morris
|
6b23d05a23
|
remove debugging
|
2014-09-02 17:48:34 -04:00 |
|
Mike Morris
|
b18cf767c0
|
use std::fopen/std::fread instead of libuv, thanks @springmeyer
|
2014-09-02 17:30:35 -04:00 |
|
Mike Morris
|
81c9615122
|
more fixes for libuv v0.10
|
2014-08-27 15:58:06 -04:00 |
|
Konstantin Käfer
|
953e5524a9
|
fix basepath for headless stylesheets
|
2014-08-27 14:28:56 +02:00 |
|
Konstantin Käfer
|
fd8280eb51
|
include correct uv header in test fixture
|
2014-08-12 12:26:07 +02:00 |
|
Konstantin Käfer
|
4ea281c750
|
rename llmr => mbgl
|
2014-07-16 18:53:56 -07:00 |
|
Konstantin Käfer
|
fbec72cd47
|
allow formatted messages
|
2014-07-11 16:25:20 -07:00 |
|
Konstantin Käfer
|
f3c55eba9d
|
add logging facility and check logs in tests
|
2014-07-11 13:55:18 -07:00 |
|
Konstantin Käfer
|
fd0b1aeffe
|
report fixture request errors
|
2014-07-10 15:13:52 -07:00 |
|
Konstantin Käfer
|
4c75c696b3
|
don't overwrite global symbol basename
|
2014-07-07 21:01:52 -07:00 |
|
Konstantin Käfer
|
49b0f098c2
|
add test fixture and image comparison
|
2014-07-07 20:31:42 -07:00 |
|