Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/master' into smoogipoo-proxydraw…
…able-presence-2
- Loading branch information
Showing
442 changed files
with
57,298 additions
and
57,302 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,19 +1,23 @@ | ||
# This won't normalise line endings, but it will ensure that merge drivers use CRLF | ||
* -text eol=crlf | ||
|
||
# Currently in-use binary file extensions | ||
*.blend binary | ||
*.bmp binary | ||
*.dll binary | ||
*.exe binary | ||
*.icns binary | ||
*.ico binary | ||
*.jpg binary | ||
*.osz2 binary | ||
*.pdn binary | ||
*.psd binary | ||
*.PSD binary | ||
*.tga binary | ||
*.ttf binary | ||
*.wav binary | ||
*.xnb binary | ||
# Autodetect text files and ensure that we normalise their | ||
# line endings to lf internally. When checked out they may | ||
# use different line endings. | ||
* text=auto | ||
|
||
# Check out with crlf (Windows) line endings | ||
*.sln text eol=crlf | ||
*.csproj text eol=crlf | ||
*.cs text diff=csharp eol=crlf | ||
*.resx text eol=crlf | ||
*.vsixmanifest text eol=crlf | ||
packages.config text eol=crlf | ||
App.config text eol=crlf | ||
*.bat text eol=crlf | ||
*.cmd text eol=crlf | ||
*.snippet text eol=crlf | ||
|
||
# Check out with lf (UNIX) line endings | ||
*.sh text eol=lf | ||
.gitignore text eol=lf | ||
.gitattributes text eol=lf | ||
*.md text eol=lf | ||
.travis.yml text eol=lf |
Oops, something went wrong.