Leith Bade 70057e1b8e Merge branch 'master' of https://github.com/mapbox/mapbox-gl-native into android-mason ...

Conflicts:
	gyp/common.gypi
	include/mbgl/geometry/vao.hpp
	include/mbgl/platform/event.hpp
	include/mbgl/platform/gl.hpp
	platform/default/http_request_baton_curl.cpp
	src/storage/response.cpp

2014-11-09 00:35:52 +11:00

..

clipper

use clipper and add missing vertices to avoid missing triangles

2014-02-27 16:00:49 +01: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 https://github.com/mapbox/mapbox-gl-native into android-mason

2014-11-09 00:35:52 +11:00

rapidjson

disable clang warning

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