Mike Morris e87a6d1871 Merge branch 'master' into android-mason ...

Conflicts:
	gyp/mbgl-ios.gypi
	gyp/mbgl-linux.gypi
	gyp/mbgl-osx.gypi
	platform/default/caching_http_file_source.cpp

2014-12-03 13:07:49 -05: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' into android-mason

2014-12-03 13:07:49 -05:00

rapidjson

disable clang warning

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