Michael Niedermayer 09ebd87a34 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>
2014-03-27 21:33:41 +01:00
..