Konstantin Käfer 5f64ecc3cc Merge branch 'master' into linux-wrapper ...

Conflicts:
	include/llmr/style/sprite.hpp

2014-02-21 12:26:16 +01:00

..

llmr

Merge branch 'master' into linux-wrapper

2014-02-21 12:26:16 +01:00

rapidjson

disable clang warning

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