From 8b53e861d9a7ff9f21eb0ff631affe18cec95ae2 Mon Sep 17 00:00:00 2001 From: Thorbjørn Lindeijer Date: Sat, 24 Oct 2009 19:36:06 +0200 Subject: More rebranding changes --- AUTHORS | 6 +- CMakeLists.txt | 4 +- INSTALL | 4 +- Mana.icns | Bin 0 -> 65136 bytes Mana.vcproj | 876 +++++++++ ManaWorld.vcproj | 876 --------- The Mana World.icns | Bin 65136 -> 0 bytes configure.ac | 4 +- data/branding.xml | 10 +- data/icons/CMakeLists.txt | 4 +- data/icons/Makefile.am | 8 +- data/icons/Mana.icns | Bin 0 -> 65136 bytes data/icons/The Mana World.icns | Bin 65136 -> 0 bytes data/icons/mana.ico | Bin 0 -> 22382 bytes data/icons/mana.png | Bin 0 -> 18176 bytes data/icons/mana.xpm | 784 ++++++++ data/icons/tmw.ico | Bin 22382 -> 0 bytes data/icons/tmw.png | Bin 18176 -> 0 bytes data/icons/tmw.xpm | 784 -------- mana.cbp | 990 ++++++++++ mana.desktop | 15 + mana.menu | 4 + mana.xcodeproj/garfield.mode1 | 1329 ++++++++++++++ mana.xcodeproj/garfield.mode1v3 | 1397 ++++++++++++++ mana.xcodeproj/project.pbxproj | 3037 +++++++++++++++++++++++++++++++ themanaworld.xcodeproj/garfield.mode1 | 1329 -------------- themanaworld.xcodeproj/garfield.mode1v3 | 1397 -------------- themanaworld.xcodeproj/project.pbxproj | 3037 ------------------------------- tmw.cbp | 990 ---------- tmw.desktop | 17 - tmw.menu | 4 - 31 files changed, 8452 insertions(+), 8454 deletions(-) create mode 100644 Mana.icns create mode 100644 Mana.vcproj delete mode 100644 ManaWorld.vcproj delete mode 100644 The Mana World.icns create mode 100644 data/icons/Mana.icns delete mode 100644 data/icons/The Mana World.icns create mode 100644 data/icons/mana.ico create mode 100644 data/icons/mana.png create mode 100644 data/icons/mana.xpm delete mode 100644 data/icons/tmw.ico delete mode 100644 data/icons/tmw.png delete mode 100644 data/icons/tmw.xpm create mode 100644 mana.cbp create mode 100644 mana.desktop create mode 100644 mana.menu create mode 100644 mana.xcodeproj/garfield.mode1 create mode 100644 mana.xcodeproj/garfield.mode1v3 create mode 100644 mana.xcodeproj/project.pbxproj delete mode 100644 themanaworld.xcodeproj/garfield.mode1 delete mode 100644 themanaworld.xcodeproj/garfield.mode1v3 delete mode 100644 themanaworld.xcodeproj/project.pbxproj delete mode 100644 tmw.cbp delete mode 100644 tmw.desktop delete mode 100644 tmw.menu diff --git a/AUTHORS b/AUTHORS index c9b69509..fdcd58be 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,6 +1,6 @@ ---------------------------------- --- The Mana World Contributors -- ---------------------------------- +----------------------- +-- Mana Contributors -- +----------------------- This file lists all contributors up to the current release. Check the wiki for the currently active development team. diff --git a/CMakeLists.txt b/CMakeLists.txt index 11d20a0a..5013a0dc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,7 +17,7 @@ IF (WIN32) SET(PKG_BINDIR ".") SET(LOCALEDIR ".") ELSE (WIN32) - SET(PKG_DATADIR ${CMAKE_INSTALL_PREFIX}/share/tmw) + SET(PKG_DATADIR ${CMAKE_INSTALL_PREFIX}/share/mana) SET(LOCALEDIR ${CMAKE_INSTALL_PREFIX}/share/locale) SET(PKG_BINDIR ${CMAKE_INSTALL_PREFIX}/bin) ENDIF (WIN32) @@ -29,4 +29,4 @@ IF (GETTEXT_FOUND AND ENABLE_NLS) ADD_SUBDIRECTORY(po) ENDIF() -INSTALL(FILES tmw.desktop DESTINATION share/applications) +INSTALL(FILES mana.desktop DESTINATION share/applications) diff --git a/INSTALL b/INSTALL index 3a332cdc..f9e03884 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ -How to compile and run TMW on your GNU/Linux Box -================================================ +How to compile and run Mana on your GNU/Linux Box +================================================= Homepage: http://manasource.org/ IRC: irc.freenode.net / #manasource diff --git a/Mana.icns b/Mana.icns new file mode 100644 index 00000000..7230a099 Binary files /dev/null and b/Mana.icns differ diff --git a/Mana.vcproj b/Mana.vcproj new file mode 100644 index 00000000..478a345c --- /dev/null +++ b/Mana.vcproj @@ -0,0 +1,876 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ManaWorld.vcproj b/ManaWorld.vcproj deleted file mode 100644 index 478a345c..00000000 --- a/ManaWorld.vcproj +++ /dev/null @@ -1,876 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/The Mana World.icns b/The Mana World.icns deleted file mode 100644 index 7230a099..00000000 Binary files a/The Mana World.icns and /dev/null differ diff --git a/configure.ac b/configure.ac index 53f6d489..9622d8aa 100755 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.59) -AC_INIT([The Mana World], [0.0.29.1], [themanaworld-devel@lists.sourceforge.net], [tmw]) +AC_INIT([Mana], [1.0.0], [themanaworld-devel@lists.sourceforge.net], [mana]) AM_INIT_AUTOMAKE([1.9]) AC_CONFIG_HEADERS([config.h:config.h.in]) AC_LANG_CPLUSPLUS @@ -100,7 +100,7 @@ else with_opengl=yes AC_CHECK_LIB([GL], [glBegin], , AC_MSG_ERROR([ *** Unable to find OpenGL library])) - AC_DEFINE(USE_OPENGL, 1, [Defines if tmw should use an OpenGL display]) + AC_DEFINE(USE_OPENGL, 1, [Defines if Mana should have OpenGL support]) fi # Enable either Manaserv or eAthena 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. --> -