summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2019-07-29 21:10:54 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2019-07-29 21:10:54 -0400
commite130a00cdf69c58dbff8e98a69559aeb33f87b60 (patch)
treee128e502a2229f5d934f0436a0eb31dc86350bbb /.gitattributes
parentef4c86fbfdd18b78700f61b629907a85579197c0 (diff)
parentd4cc0e161bf103d3d3e01fefa02e867d4a2053c2 (diff)
Merge branch 'master' into slot_machine
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes4
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
index a7233fe6a..2ca17cab1 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -11,6 +11,10 @@ Makefile text eol=lf
*.sha1 text eol=lf
*.sed text eol=lf
*.sh text eol=lf
+*.json text eol=lf
*.png binary
*.bin binary
+
+*.h linguist-language=C
+*.inc linguist-language=Assembly