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