Merge commit 'ea4b6d0802052425108efe836d70cf2b8c7dc70f' into harfbuzz

Browse source

Conflicts:
	src/font_engine_freetype.cpp

...

This commit is contained in:

Hermann Kraus 2013-03-16 17:51:05 +01:00

parent 87395157c6 ea4b6d0802

commit af6f87b195

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