Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Dec 2013 02:18:07 +0000 (03:18 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Dec 2013 02:18:07 +0000 (03:18 +0100)
commitd2d794f3aa55ab77557bb1d6082f9f6dfa90400d
treef36a4d311c359521d3fedf97417def9e80db158c
parentfde74d1b9d338e2f9c9d7eac2023388d59c98543
parente121a725c38fe9f0749e96d45738c55fdcfe2ac5
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate: Explicitly specify the pixel format for the pngparser test

Conflicts:
tests/fate/image.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tests/fate/image.mak