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