Merge branch 'master' of gitorious.org:manaplus/manaplus

1 files changed, 18 insertions, 15 deletions

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 01fa8e017..311ca756d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -26,7 +26,7 @@ src/gui/itempopup.cpp
 src/gui/killstats.cpp
 src/gui/logindialog.cpp
 src/gui/minimap.cpp
-src/gui/ministatus.cpp
+src/gui/ministatuswindow.cpp
 src/gui/npcdialog.cpp
 src/gui/npcpostdialog.cpp
 src/gui/okdialog.cpp
@@ -42,11 +42,12 @@ src/gui/setup_audio.cpp
 src/gui/setup_chat.cpp
 src/gui/setup_colors.cpp
 src/gui/setup.cpp
-src/gui/setupitem.cpp
 src/gui/setup_joystick.cpp
 src/gui/setup_keyboard.cpp
 src/gui/setup_other.cpp
+src/gui/setup_perfomance.cpp
 src/gui/setup_players.cpp
+src/gui/setup_relations.cpp
 src/gui/setup_theme.cpp
 src/gui/setup_video.cpp
 src/gui/shopwindow.cpp
@@ -59,12 +60,13 @@ src/gui/textcommandeditor.cpp
 src/gui/textdialog.cpp
 src/gui/tradewindow.cpp
 src/gui/unregisterdialog.cpp
-src/gui/updatewindow.cpp
+src/gui/updaterwindow.cpp
 src/gui/userpalette.cpp
 src/gui/whoisonline.cpp
 src/gui/widgets/battletab.cpp
 src/gui/widgets/channeltab.cpp
 src/gui/widgets/chattab.cpp
+src/gui/widgets/setupitem.cpp
 src/gui/widgets/tradetab.cpp
 src/gui/widgets/whispertab.cpp
 src/gui/windowmenu.cpp
@@ -72,9 +74,21 @@ src/gui/worldselectdialog.cpp
 src/inventory.cpp
 src/keyboardconfig.cpp
 src/localplayer.cpp
-src/log.h
+src/logger.h
 src/main.cpp
 src/net/ea/buysellhandler.cpp
+src/net/ea/charserverhandler.cpp
+src/net/ea/chathandler.cpp
+src/net/ea/gamehandler.cpp
+src/net/ea/gui/guildtab.cpp
+src/net/ea/guildhandler.cpp
+src/net/ea/gui/partytab.cpp
+src/net/ea/inventoryhandler.cpp
+src/net/ea/loginhandler.cpp
+src/net/ea/partyhandler.cpp
+src/net/ea/playerhandler.cpp
+src/net/ea/specialhandler.cpp
+src/net/ea/tradehandler.cpp
 src/net/manaserv/attributes.cpp
 src/net/manaserv/beinghandler.cpp
 src/net/manaserv/charhandler.cpp
@@ -86,20 +100,9 @@ src/net/manaserv/playerhandler.cpp
 src/net/manaserv/tradehandler.cpp
 src/net/tmwa/adminhandler.cpp
 src/net/tmwa/buysellhandler.cpp
-src/net/tmwa/charserverhandler.cpp
-src/net/tmwa/chathandler.cpp
-src/net/tmwa/gamehandler.cpp
 src/net/tmwa/generalhandler.cpp
-src/net/tmwa/gui/guildtab.cpp
-src/net/tmwa/guildhandler.cpp
-src/net/tmwa/gui/partytab.cpp
-src/net/tmwa/inventoryhandler.cpp
-src/net/tmwa/loginhandler.cpp
 src/net/tmwa/network.cpp
 src/net/tmwa/partyhandler.cpp
-src/net/tmwa/playerhandler.cpp
-src/net/tmwa/specialhandler.cpp
-src/net/tmwa/tradehandler.cpp
 src/playerrelations.cpp
 src/resources/beinginfo.cpp
 src/resources/itemdb.cpp