Merge branch 'updated-gitattributes'
This commit is contained in:
commit
08ea77a993
24
.gitattributes
vendored
24
.gitattributes
vendored
@ -1,12 +1,14 @@
|
||||
* text=auto
|
||||
*.c diff=cpp
|
||||
*.sln merge=union
|
||||
*.vcproj merge=union
|
||||
*.vcxproj merge=union
|
||||
*.sln text eol=crlf
|
||||
*.bat text eol=crlf
|
||||
configure text eol=lf
|
||||
* text=auto
|
||||
*.c diff=cpp eol=crlf
|
||||
*.h diff=cpp eol=crlf
|
||||
*.sln merge=union
|
||||
*.vcproj merge=union
|
||||
*.vcxproj merge=union
|
||||
*.sln text eol=crlf
|
||||
*.bat text eol=crlf
|
||||
configure text eol=lf
|
||||
configure.in text eol=lf
|
||||
Makefile text eol=lf
|
||||
Makefile.in text eol=lf
|
||||
*.sh text eol=lf
|
||||
Makefile text eol=lf
|
||||
Makefile.in text eol=lf
|
||||
*.sh text eol=lf
|
||||
*.sql text eol=crlf
|
||||
|
Loading…
x
Reference in New Issue
Block a user