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