Young Hahn bdb16b9ae7 Merge branch 'master' into glyphrange-master ...

Conflicts:
	bin/style.js
	src/text/placement.cpp

2014-05-29 11:59:12 -04: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 glyphrange-master

2014-05-29 11:59:12 -04:00

rapidjson

disable clang warning

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