Merge commit '20f9cf744a9a82ac4b269cb4317a5d59a8553baf' into release/2.4
[ffmpeg.git] / .gitattributes
2014-12-02 Michael NiedermayerMerge commit 'ce99ef48ea025e90351079964d63be815374f089...
2014-12-01 Reinhard TartlerTreat all '*.pnm' files as non-text file