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

..

clipper

use clipper and add missing vertices to avoid missing triangles

2014-02-27 16:00:49 +01:00

csscolorparser

use external library

2014-03-12 12:43:18 +01:00

libtess2

fix pedantic warnings

2014-03-11 12:10:07 +01:00

mbgl

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

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

rapidjson

disable clang warning

2014-02-03 11:49:17 +01:00