mirror
/
Hamlib
kopia lustrzana https://github.com/Hamlib/Hamlib
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Fix version_dll.c 

https://github.com/Hamlib/Hamlib/issues/1168
pull/1215/head
Mike Black W9MDB 2022-12-22 12:14:29 -06:00
rodzic 267d07f708
commit 17f88dccbf
1 zmienionych plików z 0 dodań i 15 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

15
src/version_dll.rc
Wyświetl plik

@ -9,7 +9,6 @@ VERSIONINFO_1 VERSIONINFO
{ {
BLOCK "040904E4" BLOCK "040904E4"
{ {
<<<<<<< HEAD
VALUE "FileDescription", "Hamlib DLL" VALUE "FileDescription", "Hamlib DLL"
VALUE "FileVersion", "4.6.0.0" VALUE "FileVersion", "4.6.0.0"
VALUE "ProductName", "Hamlib" VALUE "ProductName", "Hamlib"
@ -17,27 +16,13 @@ VERSIONINFO_1 VERSIONINFO
VALUE "InternalName", "sha256" VALUE "InternalName", "sha256"
VALUE "LegalCopyright", "Copyright Hamlib Team 2022" VALUE "LegalCopyright", "Copyright Hamlib Team 2022"
VALUE "OriginalFilename", "libhamlib-4.dll" VALUE "OriginalFilename", "libhamlib-4.dll"
=======
VALUE "CompanyName", "Hamlib Team\000"
VALUE "FileDescription", "Hamlib DLL\000"
VALUE "ProductName", "Hamlib\000"
VALUE "FileVersion", 4,6,0,0
VALUE "ProductVersion", HAMLIBDATETIME
VALUE "InternalName", "sha256"
VALUE "LegalCopyright", "Copyright Hamlib Team 2022\000"
VALUE "OriginalFilename", "libhamlib-4.dll\000"
>>>>>>> cafc094788fcdd65e5fb936e5451a08b780c8ecd
} }
} }
BLOCK "VarFileInfo" BLOCK "VarFileInfo"
{ {
<<<<<<< HEAD
VALUE "Translation", 0x409, 1200 VALUE "Translation", 0x409, 1200
=======
VALUE "Translation", 0x409, 1252
>>>>>>> cafc094788fcdd65e5fb936e5451a08b780c8ecd
} }
} }