Konstantin Käfer 4ad3a1ee76 Merge branch 'master' into blur ...

Conflicts:
	src/shader/shaders_gl.cpp
	src/shader/shaders_gles2.cpp

2014-05-26 17:30:31 +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 blur

2014-05-26 17:30:31 +02:00

rapidjson

disable clang warning

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