Merge commit '3b5707848e8f1d06add0cf4e75ad1169368c68dd' into harfbuzz

Browse source

Conflicts:
	include/mapnik/text_path.hpp

...

This commit is contained in:

Hermann Kraus 2013-03-16 18:14:04 +01:00

parent 59f2d776b4 3b5707848e

commit 3ca1f00487

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available