Merge commit 'b00444c0bbbc78ae477ec697d6569893609f420d' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 12:06:52 +0000 (14:06 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 12:06:52 +0000 (14:06 +0200)
commit4ccde2d356e73430738380cb8b94575bdf707f9b
tree732bdb68e4a952772d4330284f8d5fe187ee4dce
parentfb487e2f6668ccb67100acc7a9b86f68af9c523b
parentb00444c0bbbc78ae477ec697d6569893609f420d
Merge commit 'b00444c0bbbc78ae477ec697d6569893609f420d' into release/1.1

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

Conflicts:
configure

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