Merge commit 'ce99ef48ea025e90351079964d63be815374f089' into release/2.4

* commit 'ce99ef48ea025e90351079964d63be815374f089':
  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 11:40:39 +01:00
commit 575dc3a1b2

1
.gitattributes vendored Normal file
View File

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