stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-21 12:01:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

gitattributes: do not check whitespace for included libs

Browse source
This commit is contained in:
Alam Ed Arias 2016-05-18 10:36:33 -04:00
parent b566036661
commit f3d0ecbe9d
2 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
.gitattributes vendored
View file

@ -13,22 +13,6 @@
*.manifest -crlf -whitespace *.manifest -crlf -whitespace
# Patches # Patches
/tools/SDL-1.2.14-gc/SDL-1.2.14-gc.patch -whitespace /tools/SDL-1.2.14-gc/SDL-1.2.14-gc.patch -whitespace
# LibPNG
/libs/libpng-src/CMakeLists.txt -whitespace
/libs/libpng-src/libpng-1.2.*.txt -whitespace
/libs/libpng-src/libpng.3 -whitespace
/libs/libpng-src/*.c -whitespace
# Zlib
/libs/zlib/contrib/amd64/amd64-match.S -whitespace
/libs/zlib/contrib/delphi/zlibd32.mak -crlf -whitespace
/libs/zlib/contrib/gcc_gvmat64/gvmat64.S -whitespace
/libs/zlib/contrib/minizip/MiniZip64_Changes.txt -whitespace
/libs/zlib/contrib/minizip/MiniZip64_info.txt -whitespace
/libs/zlib/contrib/pascal/zlibd32.mak -whitespace
/libs/zlib/nintendods/Makefile -whitespace
/libs/zlib/nintendods/README -whitespace
/libs/zlib/watcom/watcom_f.mak -crlf -whitespace
/libs/zlib/watcom/watcom_l.mak -crlf -whitespace
#Appveyor #Appveyor
/appveyor.yml -crlf -whitespace /appveyor.yml -crlf -whitespace
# Other # Other

8
libs/.gitattributes vendored Normal file
View file

@ -0,0 +1,8 @@
#All
* -whitespace
# Zlib
/zlib/watcom/watcom_f.mak -crlf
/zlib/watcom/watcom_l.mak -crlf
#SDL2
/SDL2/docs/README-porting.md conflict-marker-size=32
# Other