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

..

flags.sh

Merge branch 'libuv-0.10-headless-display' into mason

2014-10-22 15:14:21 +02:00

npm_install.sh

pass absolute path to npm executable

2014-08-12 13:29:26 +02:00

run_tests.sh

test with the current release type's settings to avoid double compiles

2014-08-27 12:37:07 +02:00

travis_before_install.sh

Merge branch 'libuv-0.10-headless-display' into mason

2014-10-22 15:14:21 +02:00

travis_helper.sh

better timing functions

2014-10-16 06:54:36 -07:00

travis_install_test_suite.sh

Merge branch 'libuv-0.10-headless-display' into mason

2014-10-22 15:14:21 +02:00

travis_script.sh

fix misnamed function

2014-10-16 07:00:04 -07:00