summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2020-06-01 04:08:28 +0200
committerGitHub <noreply@github.com>2020-06-01 04:08:28 +0200
commit36aff97b92f9f42f9bc59911b7d06110a8e9aed5 (patch)
tree69d20dc9137da111ecda664a896bbf0abbead02e /.gitattributes
parentb9f7d1439c84b64facaf7d2875adc29110c65cf4 (diff)
parentc66d467fb5816734851b7de6b20537ce7a08c861 (diff)
downloadhercules-36aff97b92f9f42f9bc59911b7d06110a8e9aed5.tar.gz
hercules-36aff97b92f9f42f9bc59911b7d06110a8e9aed5.tar.bz2
hercules-36aff97b92f9f42f9bc59911b7d06110a8e9aed5.tar.xz
hercules-36aff97b92f9f42f9bc59911b7d06110a8e9aed5.zip
Merge pull request #2671 from Helianthella/binliteral
add support for binary and octal number literals
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes8
1 files changed, 7 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes
index a839a28c9..d565bc7ac 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2,4 +2,10 @@
*.c diff=cpp
*.sln merge=union
*.vcproj merge=union
-*.vcxproj merge=union \ No newline at end of file
+*.vcxproj merge=union
+
+# libconfig generated files
+3rdparty/libconfig/grammar.c linguist-generated=true
+3rdparty/libconfig/grammar.h linguist-generated=true
+3rdparty/libconfig/scanner.c linguist-generated=true
+3rdparty/libconfig/scanner.h linguist-generated=true