Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 27 Mar 2014 00:59:32 +0000 (01:59 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 27 Mar 2014 00:59:32 +0000 (01:59 +0100)
commit62094e2fddf53f608bc42f54ae50979ec8eb2b84
tree7e0919b560b44a55281d7a1a53a0af580273241f
parent12ab07be447264b107b18bc49bb9e06be072330f
parent9718c31ef60c6aced1fcfab788edb7ca8b6719ee
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate: add Alias PIX tests

Conflicts:
tests/fate/image.mak

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