Leith Bade 8f1754cf0a Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason ...

Conflicts:
	include/mbgl/storage/base_request.hpp
	include/mbgl/storage/file_request_baton.hpp
	include/mbgl/storage/http_request.hpp
	include/mbgl/storage/http_request_baton.hpp
	include/mbgl/util/uv_detail.hpp
	platform/darwin/http_request_baton_cocoa.mm
	platform/default/caching_http_file_source.cpp
	platform/default/http_request_baton_curl.cpp
	src/map/map.cpp
	src/storage/base_request.cpp
	src/storage/file_request.cpp
	src/storage/file_request_baton.cpp
	src/storage/http_request.cpp
	src/storage/http_request_baton.cpp

2014-12-04 22:19:46 +11:00

..

clipper

use clipper and add missing vertices to avoid missing triangles

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

coffeecatch

Add coffeecatch

2014-11-16 19:32:51 +11:00

csscolorparser

fix variable shadowing

2014-10-22 18:19:01 +02:00

libtess2

fix pedantic warnings

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

mbgl

Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason

2014-12-04 22:19:46 +11:00

rapidjson

disable clang warning

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