Merge commit 'd81fb63d87692765c004c19934b49427df434a07'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 6 May 2015 19:21:00 +0000 (21:21 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 6 May 2015 19:21:00 +0000 (21:21 +0200)
commit20ce69e5f85dd29cc850a98060972821d69bfd3a
tree6a41d68baa1a741305276444c22bae070a3841f9
parentffed987a4d4afb8851d80b772eb9ee02cda20ef9
parentd81fb63d87692765c004c19934b49427df434a07
Merge commit 'd81fb63d87692765c004c19934b49427df434a07'

* commit 'd81fb63d87692765c004c19934b49427df434a07':
  fate: Add a PICT test

Conflicts:
tests/fate/image.mak

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