Hermann Kraus f992927cd3 Merge commit '631923e675b486583dbded735b7df4dca6b7cd0b' into hb-test2 ... Conflicts: src/font_engine_freetype.cpp		2013-03-20 17:15:02 +01:00
..
mapnik	Merge commit '631923e675b486583dbded735b7df4dca6b7cd0b' into hb-test2	2013-03-20 17:15:02 +01:00
build.py	Merge commit '57aa6dd05230876bf7c022d3554436e4d35de77f' into harfbuzz	2013-03-16 12:46:01 +01:00