Merge commit '66d04c068a30751750818dcfbb6555ab74eb3f6d'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 1 Apr 2014 19:00:26 +0000 (21:00 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 1 Apr 2014 19:00:26 +0000 (21:00 +0200)
commit909757fabdf8d7f9360a06a81625a58a5ec3e05c
tree897fabb84050e664bb46aadc47f796123f7badc7
parent3b37f2286199ccec7e30b74c56b975e1e4e77739
parent66d04c068a30751750818dcfbb6555ab74eb3f6d
Merge commit '66d04c068a30751750818dcfbb6555ab74eb3f6d'

* commit '66d04c068a30751750818dcfbb6555ab74eb3f6d':
  fate: Explicitly use gray16le in fate-sgi-gray16

Conflicts:
tests/fate/image.mak

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