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

Conflicts:
	README.md
	configure
	gyp/mbgl-linux.gypi
	include/mbgl/map/map.hpp
	include/mbgl/platform/default/image_reader.hpp
	include/mbgl/platform/default/jpeg_reader.hpp
	include/mbgl/platform/default/png_reader.hpp
	include/mbgl/util/uv_detail.hpp
	ios/mapbox-gl-cocoa
	platform/default/image.cpp
	platform/default/image_reader.cpp
	platform/default/jpeg_reader.cpp
	platform/default/png_reader.cpp
	src/map/map.cpp

2014-11-28 01:51:21 +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-11-28 01:51:21 +11:00

rapidjson

disable clang warning

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