Konstantin Käfer 915e89bee8 Merge branch 'master' into symbols ...

Conflicts:
	src/renderer/painter_text.cpp

2014-08-06 15:32:48 +02: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 symbols

2014-08-06 15:32:48 +02:00

rapidjson

disable clang warning

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