2019-11-26 00:14:55 +03:00
|
|
|
* text=auto
|
|
|
|
|
*.sln eol=crlf
|
|
|
|
|
*.vcxproj eol=crlf
|
|
|
|
|
*.vcxproj.filters eol=crlf
|
|
|
|
|
*.bat eol=crlf
|
|
|
|
|
*.rc eol=crlf
|
|
|
|
|
**/compiled/*.h eol=crlf
|
|
|
|
|
**/shaders/gen/*.inc eol=lf
|
|
|
|
|
*.sh eol=lf
|
|
|
|
|
*.gn eol=lf
|
|
|
|
|
*.gni eol=lf
|
|
|
|
|
src/compiler/preprocessor/preprocessor_*.* eol=lf
|
|
|
|
|
src/compiler/translator/glslang_*.* eol=lf
|
2019-01-21 04:10:17 +03:00
|
|
|
|
|
|
|
|
# Git conflict markers in the json file break the code generator.
|
2019-07-11 21:06:23 +03:00
|
|
|
# Using a binary merge strategy forces conflicts without changing file contents.
|
|
|
|
|
scripts/code_generation_hashes/*.json merge=binary
|
