Hermann Kraus 04c0fa0767 Merge commit 'f25d4d9279fc99650b88d980a8c579a6b541d4b5' into harfbuzz ... Conflicts: src/cairo_renderer.cpp		2013-03-16 15:40:54 +01:00
..
mapnik	Merge commit 'f25d4d9279fc99650b88d980a8c579a6b541d4b5' into harfbuzz	2013-03-16 15:40:54 +01:00
build.py	Merge commit '57aa6dd05230876bf7c022d3554436e4d35de77f' into harfbuzz	2013-03-16 12:46:01 +01:00