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