Michael Niedermayer 62094e2fdd 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>
2014-03-27 01:59:32 +01:00
..
2014-03-22 17:50:02 +01:00
2014-01-15 21:20:47 +01:00
2013-07-29 19:20:27 +02:00
2013-08-08 22:59:42 +02:00