Merge branch 'master' of git.sv.gnu.org:/srv/git/freetype/freetype2

Browse Source

Conflicts:
	ChangeLog

...

This commit is contained in:

Werner Lemberg 2011-04-21 08:25:14 +02:00

parent 8c82ec5b17 94eff482ca

commit a8dbf7dbbc

1 changed files with 28 additions and 28 deletions

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