Hermann Kraus 297bfeb454 Merge branch 'master' into harfbuzz ... Conflicts: src/symbolizer_helpers.cpp		2012-09-08 01:26:47 +02:00
..
mapnik	Merge branch 'master' into harfbuzz	2012-09-08 01:26:47 +02:00
build.py	fix the include install directory nesting	2012-08-27 18:54:08 -07:00