diff options
author | Jared Adams <jaxad0127@gmail.com> | 2009-10-24 11:44:47 -0600 |
---|---|---|
committer | Jared Adams <jaxad0127@gmail.com> | 2009-10-24 11:44:47 -0600 |
commit | 152a4388832bbc74d22490070eb378c89e50e7fe (patch) | |
tree | dfc7e9520d99e4da7d1a4166d1e8748dace721a1 /data | |
parent | 6d2a44c985d5a841231ac64b05898c81dc98b379 (diff) | |
parent | 8b53e861d9a7ff9f21eb0ff631affe18cec95ae2 (diff) | |
download | mana-152a4388832bbc74d22490070eb378c89e50e7fe.tar.gz mana-152a4388832bbc74d22490070eb378c89e50e7fe.tar.bz2 mana-152a4388832bbc74d22490070eb378c89e50e7fe.tar.xz mana-152a4388832bbc74d22490070eb378c89e50e7fe.zip |
Merge branch 'master' of gitorious.org:mana/mana
Conflicts:
mana.desktop
mana.menu
Diffstat (limited to 'data')
-rw-r--r-- | data/branding.xml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/data/branding.xml b/data/branding.xml index fd5779f6..fb709ac1 100644 --- a/data/branding.xml +++ b/data/branding.xml @@ -10,12 +10,12 @@ writing a branding.xml for their forks. --> <configuration> - <option name="appName" value="The Mana World"/> - <option name="appShort" value="tmw"/> - <option name="appIcon" value="icons/tmw.png"/> + <option name="appName" value="Mana Client"/> + <option name="appShort" value="mana"/> + <option name="appIcon" value="icons/mana.png"/> <option name="loginMusic" value="Magick - Real.ogg"/> - <option name="defaultServer" value="server.themanaworld.org"/> - <option name="defaultPort" value="6901"/> + <option name="defaultServer" value="testing.manasource.org"/> + <option name="defaultPort" value="9601"/> <option name="defaultUpdateHost" value="http://updates.themanaworld.org"/> <option name="font" value="fonts/dejavusans.ttf" /> <option name="boldFont" value="fonts/dejavusans-bold.ttf" /> |