Resolve Conflicts #10

Merged
Snoweuph merged 8 commits from dev-scene into dev-base 2023-01-31 11:43:28 +00:00
Showing only changes of commit 84293bb4dc - Show all commits

29
.gitattributes vendored
View file

@ -1,13 +1,20 @@
# ---> Godot # Properly detect languages
# Godot-specific ignores *.h linguist-language=cpp
.import/ *.inc linguist-language=cpp
export.cfg thirdparty/* linguist-vendored
export_presets.cfg
# Imported translations (automatically generated from CSV files) # Normalize EOL for all files that Git considers text files
*.translation * text=auto eol=lf
# Except for bat files, which are Windows only files
# Mono-specific ignores *.bat eol=crlf
.mono/ # And some test files where the EOL matters
data_*/ *.test.txt -text
# The above only works properly for Git 2.10+, so for older versions
# we need to manually list the binary files we don't want modified.
*.icns binary
*.ico binary
*.jar binary
*.png binary
*.ttf binary
*.tza binary