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