Merge commit 'b00444c0bbbc78ae477ec697d6569893609f420d' into release/1.1

Browse Source

* commit 'b00444c0bbbc78ae477ec697d6569893609f420d':
  configure: Update freetype check to follow upstream

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>

...

This commit is contained in:

Michael Niedermayer

2014-04-21 14:06:52 +02:00

parent fb487e2f66 b00444c0bb

commit 4ccde2d356

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available