mirror of
https://git.do.srb2.org/STJr/SRB2.git
synced 2024-11-28 15:11:55 +00:00
9 lines
157 B
Text
9 lines
157 B
Text
|
#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
|