Merge commit '086a541857812b2e0435db38fbabfddc7d19e53c'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Aug 2014 22:43:06 +0000 (00:43 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Aug 2014 22:53:50 +0000 (00:53 +0200)
commit6b646fb9e2cea927a744dabb7c412a13a13d219d
treefe3c30021964f9cd65de96606361e056d69b41ab
parent700bf1fa4e783ec078615f3b13dfad979f4d2ccf
parent086a541857812b2e0435db38fbabfddc7d19e53c
Merge commit '086a541857812b2e0435db38fbabfddc7d19e53c'

* commit '086a541857812b2e0435db38fbabfddc7d19e53c':
  fate: png-suite

Conflicts:
tests/fate/image.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tests/fate/image.mak
tests/ref/fate/png-gray16
tests/ref/fate/png-gray8
tests/ref/fate/png-rgb24
tests/ref/fate/png-rgb48
tests/ref/fate/png-rgba
tests/ref/fate/png-ya16
tests/ref/fate/png-ya8