Konstantin Käfer 5135c59b71 Merge branch 'master' into outdoors-style ...

Conflicts:
	bin/style.js
	src/map/map.cpp

2014-05-13 16:18:52 +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

llmr

Merge branch 'master' into outdoors-style

2014-05-13 16:18:52 +02:00

rapidjson

disable clang warning

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