diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-02-05 15:00:58 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-02-05 15:00:58 +0300 |
| commit | 9a3a196dbf633a699c26d0227802a42f025c8bfd (patch) | |
| tree | dfbdb2ff1e2c54d75a2bf6411d3f70df22518c28 /src/manaplus.rc | |
| parent | fc17ff22d9df50df9c5d1cf3dc0de358001271ed (diff) | |
| parent | ece36a40d4e9a838cde01075d7681b8fc517b19f (diff) | |
| download | plus-9a3a196dbf633a699c26d0227802a42f025c8bfd.tar.gz plus-9a3a196dbf633a699c26d0227802a42f025c8bfd.tar.bz2 plus-9a3a196dbf633a699c26d0227802a42f025c8bfd.tar.xz plus-9a3a196dbf633a699c26d0227802a42f025c8bfd.zip | |
Merge branch 'master' into stripped
Conflicts:
src/guichan/gui.cpp
src/guichan/include/guichan/sdl/sdlpixel.hpp
Diffstat (limited to 'src/manaplus.rc')
| -rw-r--r-- | src/manaplus.rc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/manaplus.rc b/src/manaplus.rc index b7720e2cc..b16ca40a7 100644 --- a/src/manaplus.rc +++ b/src/manaplus.rc @@ -3,6 +3,7 @@ #include "winver.h" A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "../data/icons/manaplus.ico" +evol ICON MOVEABLE PURE LOADONCALL DISCARDABLE "../data/evol/icons/evol-client.ico" 1 VERSIONINFO FILEVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD @@ -11,10 +12,10 @@ PRODUCTVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD { BLOCK "StringFileInfo" { BLOCK "040904E4" { - VALUE "CompanyName", "The Mana Development Team" + VALUE "CompanyName", "The ManaPlus Development Team" VALUE "FileVersion", PACKAGE_VERSION "4144" VALUE "FileDescription", "ManaPlus" - VALUE "LegalCopyright", "2004-2010 (C)" + VALUE "LegalCopyright", "2004-2012 (C)" VALUE "OriginalFilename", "manaplus.exe" VALUE "ProductName", "ManaPlus MMORPG Client" VALUE "ProductVersion", PACKAGE_VERSION "4144" |