Merge commit 'cfb4ee30977732674d30c20e93a761c33c743972'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Dec 2013 17:16:26 +0000 (18:16 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Dec 2013 17:55:15 +0000 (18:55 +0100)
commit682b28b41098f4445581076c44fb8420306eacec
treedfeae00ab8798516814a193c484d4c6c3662a811
parentb22989da47beaa65d855d42bedf5e9961b84d983
parentcfb4ee30977732674d30c20e93a761c33c743972
Merge commit 'cfb4ee30977732674d30c20e93a761c33c743972'

* commit 'cfb4ee30977732674d30c20e93a761c33c743972':
  fate: add a pngparser test

Conflicts:
tests/fate/image.mak

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