Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Mar 2014 10:32:51 +0000 (11:32 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Mar 2014 11:03:23 +0000 (12:03 +0100)
commite1d10017039de37d1311892fcd49bd936777a196
tree4a8dab3dc675d5e86143722d926d7450c4f3efee
parenta696b0917d1d1ef5b0dee691786ddb51ee4ab519
parente8e560f2a20e59789cafef174b382054ad9721ea
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate: add a bmpparser test

Conflicts:
tests/fate/image.mak

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