Merge pull request #6126 from jherico/marge

Removing .gitattributes until we can tackle consistent line endings without impacting the team
This commit is contained in:
Brad Hefta-Gaub 2015-10-20 12:48:06 -07:00
commit 9717a53b07

25
.gitattributes vendored
View file

@ -1,25 +0,0 @@
*.cpp text
*.c text
*.h text
*.qml text
*.js text
*.json text
*.slv text
*.slf text
*.slh text
*.vert text
*.frag text
*.fst text
*.ini text
*.html text
*.ts text
*.txt text
# Denote all files that are truly binary and should not be modified.
*.png binary
*.jpg binary
*.wav binary
*.fbx binary
*.dds binary
*.svg binary
*.ttf binary