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

..

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 'master' into libuv-0.10-headless-display

2014-10-10 12:24:45 -04:00

rapidjson

disable clang warning

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