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