diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-02 14:14:34 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-02 14:14:39 +0100 |
| commit | afcd152b973e40763aa800dd1376925ce6b146b9 (patch) | |
| tree | 0496bfb76f9032934b6d4a0ba0f3eba58e2f3cb1 | |
| parent | dad7beaceb652864cd16747db4109e7b9b2b4ea1 (diff) | |
| parent | 2bcd8f22f2fae253d87b11a5c9f8805d79253180 (diff) | |
| download | ffmpeg-afcd152b973e40763aa800dd1376925ce6b146b9.tar.gz | |
Merge commit '2bcd8f22f2fae253d87b11a5c9f8805d79253180' into release/2.2
* commit '2bcd8f22f2fae253d87b11a5c9f8805d79253180':
Treat all '*.pnm' files as non-text file
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | .gitattributes | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000..a900528e47 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.pnm -diff -text |