- define zdoom.rc as a proper Windows text file, stop Git from mismanaging it

# Conflicts:
#	src/win32/zdoom.rc
This commit is contained in:
Rachael Alexanderson 2018-05-17 17:39:18 -04:00 committed by drfrag666
parent 4811962acb
commit 3d86244b61
2 changed files with 3 additions and 2 deletions

1
.gitattributes vendored
View file

@ -15,6 +15,7 @@
*.vcproj text eol=crlf
*.sln text eol=crlf
*.bat text eol=crlf
*.rc text eol=crlf
*.txt text
language.* text

View file

@ -76,7 +76,7 @@ BEGIN
" VALUE ""FileDescription"", ""GZDoom""\r\n"
" VALUE ""FileVersion"", RC_FILEVERSION2\r\n"
" VALUE ""InternalName"", ""GZDoom""\r\n"
" VALUE ""LegalCopyright"", ""Copyright © 1993-1996 id Software, 1998-2010 Randy Heit, 2002-2010 Christoph Oelckers, et al.""\r\n"
" VALUE ""LegalCopyright"", ""Copyright © 1993-1996 id Software, 1998-2010 Randy Heit, 2002-2010 Christoph Oelckers, et al.""\r\n"
" VALUE ""LegalTrademarks"", ""DoomR is a Registered Trademark of id Software, Inc.""\r\n"
" VALUE ""OriginalFilename"", ""gzdoom.exe""\r\n"
" VALUE ""ProductName"", ""GZDoom""\r\n"
@ -535,7 +535,7 @@ BEGIN
VALUE "FileDescription", "GZDoom"
VALUE "FileVersion", RC_FILEVERSION2
VALUE "InternalName", "GZDoom"
VALUE "LegalCopyright", "Copyright © 1993-1996 id Software, 1998-2010 Randy Heit, 2002-2010 Christoph Oelckers, et al."
VALUE "LegalCopyright", "Copyright © 1993-1996 id Software, 1998-2010 Randy Heit, 2002-2010 Christoph Oelckers, et al."
VALUE "LegalTrademarks", "DoomR is a Registered Trademark of id Software, Inc."
VALUE "OriginalFilename", "gzdoom.exe"
VALUE "ProductName", "GZDoom"