Merged New Inventory Project into main branch

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1871 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
lalien
2008-03-08 15:15:25 +00:00
parent e16d166277
commit 43ca24dda8
649 changed files with 93359 additions and 82507 deletions
BIN
View File
Binary file not shown.
+27 -27
View File
@@ -29,22 +29,22 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
1 TEXTINCLUDE
BEGIN
"resource.h\0"
"resource.h\0"
END
2 TEXTINCLUDE
BEGIN
"#include ""afxres.h""\r\n"
"\0"
"#include ""afxres.h""\r\n"
"\0"
END
3 TEXTINCLUDE
BEGIN
"\r\n"
"\0"
"\r\n"
"\0"
END
#endif // APSTUDIO_INVOKED
#endif // APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
@@ -65,24 +65,24 @@ VS_VERSION_INFO VERSIONINFO
FILETYPE 0x7L
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "CompanyName", "Sir-Tech Canada Ltd."
VALUE "FileDescription", "Jagged Alliance 2 Gold"
VALUE "FileVersion", "1, 0, 0, 6"
VALUE "InternalName", "Jagged Alliance 2"
VALUE "LegalCopyright", "Copyright © 1998"
VALUE "OriginalFilename", "Ja2.exe"
VALUE "ProductName", "Jagged Alliance 2 Gold"
VALUE "ProductVersion", "1, 0, 0, 6"
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1200
END
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "CompanyName", "Sir-Tech Canada Ltd."
VALUE "FileDescription", "Jagged Alliance 2 Gold"
VALUE "FileVersion", "1, 0, 0, 6"
VALUE "InternalName", "Jagged Alliance 2"
VALUE "LegalCopyright", "Copyright © 1998"
VALUE "OriginalFilename", "Ja2.exe"
VALUE "ProductName", "Jagged Alliance 2 Gold"
VALUE "ProductVersion", "1, 0, 0, 6"
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1200
END
END
@@ -93,8 +93,8 @@ END
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
IDI_ICON1 ICON "jagged3.ico"
#endif // English (U.S.) resources
IDI_ICON1 ICON "jagged3.ico"
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////
@@ -107,5 +107,5 @@ IDI_ICON1 ICON "jagged3.ico"
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
#endif // not APSTUDIO_INVOKED
+6 -6
View File
@@ -2,17 +2,17 @@
// Microsoft Developer Studio generated include file.
// Used by ja2.rc and console.rc
//
#define IDI_ICON1 113
#define IDI_ICON2 115
#define IDI_ICON1 113
#define IDI_ICON2 115
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 114
#define _APS_NEXT_COMMAND_VALUE 40001
#define _APS_NEXT_CONTROL_VALUE 1000
#define _APS_NEXT_SYMED_VALUE 101
#define _APS_NEXT_RESOURCE_VALUE 114
#define _APS_NEXT_COMMAND_VALUE 40001
#define _APS_NEXT_CONTROL_VALUE 1000
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif