Merge commit '0f257e29c5520b215e573e7e3abde8e5a4743309'

* commit '0f257e29c5520b215e573e7e3abde8e5a4743309': Treat all '*.pnm' files as non-text file Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago · 7944065114
parent 4c592c3908 0f257e29c5
commit 7944065114
1 changed files with 1 additions and 0 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -0,0 +1 @@
+*.pnm -diff -text