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