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