Merge commit '5292e97c42b05db7ad4e51c1ea756b12fdf721ff'
[ffmpeg.git] / .gitattributes
2017-01-27 Paul B Maholfate: add SCC test
2014-11-28 Reinhard TartlerTreat all '*.pnm' files as non-text file