Merge commit '688417399c69aadd4c287bdb0dec82ef8799011c'
[ffmpeg.git] / .gitattributes
1 *.pnm -diff -text