1.16.2.0
This commit is contained in:
parent
36fb9f1765
commit
295dcbee34
1 changed files with 13 additions and 0 deletions
|
@ -245,8 +245,13 @@ DISK_ICON ICON "DISK.ICO"
|
||||||
//
|
//
|
||||||
|
|
||||||
VS_VERSION_INFO VERSIONINFO
|
VS_VERSION_INFO VERSIONINFO
|
||||||
|
<<<<<<< .mine
|
||||||
|
FILEVERSION 1,16,2,0
|
||||||
|
PRODUCTVERSION 1,16,2,0
|
||||||
|
=======
|
||||||
FILEVERSION 1,16,1,3
|
FILEVERSION 1,16,1,3
|
||||||
PRODUCTVERSION 1,16,1,3
|
PRODUCTVERSION 1,16,1,3
|
||||||
|
>>>>>>> .r620
|
||||||
FILEFLAGSMASK 0x3fL
|
FILEFLAGSMASK 0x3fL
|
||||||
#ifdef _DEBUG
|
#ifdef _DEBUG
|
||||||
FILEFLAGS 0x1L
|
FILEFLAGS 0x1L
|
||||||
|
@ -264,12 +269,20 @@ BEGIN
|
||||||
VALUE "Comments", "http://applewin.berlios.de"
|
VALUE "Comments", "http://applewin.berlios.de"
|
||||||
VALUE "CompanyName", "AppleWin"
|
VALUE "CompanyName", "AppleWin"
|
||||||
VALUE "FileDescription", "Apple //e Emulator for Windows"
|
VALUE "FileDescription", "Apple //e Emulator for Windows"
|
||||||
|
<<<<<<< .mine
|
||||||
|
VALUE "FileVersion", "1, 16, 2, 0"
|
||||||
|
=======
|
||||||
VALUE "FileVersion", "1, 16, 1, 3"
|
VALUE "FileVersion", "1, 16, 1, 3"
|
||||||
|
>>>>>>> .r620
|
||||||
VALUE "InternalName", "APPLEWIN"
|
VALUE "InternalName", "APPLEWIN"
|
||||||
VALUE "LegalCopyright", " 1994-2009 Michael O'Brien, Oliver Schmidt, Tom Charlesworth, Michael Pohoreski, Nick Westgate, Linards Ticmanis"
|
VALUE "LegalCopyright", " 1994-2009 Michael O'Brien, Oliver Schmidt, Tom Charlesworth, Michael Pohoreski, Nick Westgate, Linards Ticmanis"
|
||||||
VALUE "OriginalFilename", "APPLEWIN.EXE"
|
VALUE "OriginalFilename", "APPLEWIN.EXE"
|
||||||
VALUE "ProductName", "Apple //e Emulator"
|
VALUE "ProductName", "Apple //e Emulator"
|
||||||
|
<<<<<<< .mine
|
||||||
|
VALUE "ProductVersion", "1, 16, 2, 0"
|
||||||
|
=======
|
||||||
VALUE "ProductVersion", "1, 16, 1, 3"
|
VALUE "ProductVersion", "1, 16, 1, 3"
|
||||||
|
>>>>>>> .r620
|
||||||
END
|
END
|
||||||
END
|
END
|
||||||
BLOCK "VarFileInfo"
|
BLOCK "VarFileInfo"
|
||||||
|
|
Loading…
Add table
Reference in a new issue