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

..

fixtures

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

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

clip_ids.cpp

compute unique clip ids per tile, taking covering children into account

2014-08-21 15:02:08 +02:00

comparisons.cpp

rename llmr => mbgl

2014-07-16 18:53:56 -07:00

enums.cpp

use ASSERT_FALSE for boolean comparisons

2014-10-22 04:20:51 -07:00

functions.cpp

consolidate functions to only use stops

2014-07-17 14:32:35 -07:00

headless.cpp

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

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

main.cpp

add gtest

2014-03-17 12:32:27 +01:00

rotation_range.cpp

rename llmr => mbgl

2014-07-16 18:53:56 -07:00

style_parser.cpp

use ASSERT_FALSE for boolean comparisons

2014-10-22 04:20:51 -07:00

test.gyp

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

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

tile.cpp

rename llmr => mbgl

2014-07-16 18:53:56 -07:00

variant.cpp

rename llmr => mbgl

2014-07-16 18:53:56 -07:00