diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2014-10-22 15:14:21 +0200 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2014-10-22 15:14:21 +0200 |
| commit | 905c4294be495d15591885a2438ca0b8abc8decf (patch) | |
| tree | 851a94849eb7a1f3269b91de6054846cfbda722b /test/test.gyp | |
| parent | c6e4cf2f80216c7139b6587dcd6d919080aef20d (diff) | |
| parent | 8954b3971f5cb90dc4b18e61b58ea6e41c54fffe (diff) | |
| download | qtlocation-mapboxgl-905c4294be495d15591885a2438ca0b8abc8decf.tar.gz | |
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
Diffstat (limited to 'test/test.gyp')
| -rw-r--r-- | test/test.gyp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/test/test.gyp b/test/test.gyp index 1f63756e71..8bf1dffdfb 100644 --- a/test/test.gyp +++ b/test/test.gyp @@ -169,6 +169,8 @@ "./headless.cpp", "../common/headless_view.hpp", "../common/headless_view.cpp", + "../common/headless_display.hpp", + "../common/headless_display.cpp", "../common/platform_default.cpp", "./fixtures/fixture_request.cpp", "./fixtures/fixture_log.hpp", |