Merge commit '3bc45ca7ced658537fc288948f3a7976674c50d5' into harfbuzz

Browse source

Conflicts:
	src/font_engine_freetype.cpp

...

This commit is contained in:

Hermann Kraus 2013-03-20 17:29:54 +01:00

parent 0398e300af 3bc45ca7ce

commit 7ce1433675

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