Merge commit '900b6172bfc4be5b706600b49a587de40e6cf673' into harfbuzz

Browse source

Conflicts:
	include/mapnik/placement_finder.hpp

...

This commit is contained in:

Hermann Kraus 2013-03-16 15:12:33 +01:00

parent 2735b47bd3 900b6172bf

commit 363ab5b47a

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