Merge commit '4edbb0955e043d698dcc1b5073b6e714f9cc7960' 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