Merge commit '2bcd8f22f2fae253d87b11a5c9f8805d79253180' into release/2.2

* commit '2bcd8f22f2fae253d87b11a5c9f8805d79253180':
  Treat all '*.pnm' files as non-text file

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-12-02 14:14:34 +01:00
commit afcd152b97

1
.gitattributes vendored Normal file
View File

@ -0,0 +1 @@
*.pnm -diff -text