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 /docs | |
| 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 'docs')
| -rw-r--r-- | docs/example.manaplus | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/example.manaplus b/docs/example.manaplus index 8be9c675e..2a580463f 100644 --- a/docs/example.manaplus +++ b/docs/example.manaplus @@ -9,9 +9,9 @@ filename / path as a command line parameter --> <configuration> - <option name="appName" value="Mana"/> + <option name="appName" value="ManaPlus"/> <option name="appShort" value="mana"/> - <option name="appIcon" value="icons/manaplus.png"/> + <option name="appIcon" value="icons/manaplus"/> <option name="loginMusic" value="Magick - Real.ogg"/> <option name="onlineServerList" value="http://manasource.org/serverlist.xml"/> <option name="defaultServer" value="server.themanaworld.org"/> |