Merge commit 'be61bf6fef4d593c3d94701c66efc7404d442eee' into harfbuzz

Browse source

Conflicts:
	include/mapnik/text_path.hpp
	src/cairo_context.cpp
	src/font_engine_freetype.cpp
	src/placement_finder.cpp

...

This commit is contained in:

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

parent 3ca1f00487 be61bf6fef

commit 1b6982e773

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