Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 27 Mar 2014 20:32:38 +0000 (21:32 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 27 Mar 2014 20:33:41 +0000 (21:33 +0100)
commit09ebd87a34b99799f906324053b0dcfd87c4205d
tree42ea6e8f7ff11f1008dac472cde5e6b8906ba773
parentf392949f1ac799ad1d7c1cda66e41c1670022d5a
parentbb36b9aa7ef8f2c0993dfe04a358bce76b367d61
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate: add BRender PIX tests

Conflicts:
tests/fate/image.mak

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