summaryrefslogtreecommitdiff
path: root/po
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2009-02-09 23:47:02 +0100
committerBjørn Lindeijer <bjorn@lindeijer.nl>2009-02-09 23:47:02 +0100
commitfa2f3ac593a792c32095c2e885665ec91bb4019d (patch)
treef44aee845f0229dfcc6b2ad3c74613e0352f36c2 /po
parent07f7d52f661a74e6d0c780ca53e724651e3dcc48 (diff)
parent40edf4e91558cffd83d9015a2cf4a16360e27855 (diff)
downloadmana-fa2f3ac593a792c32095c2e885665ec91bb4019d.tar.gz
mana-fa2f3ac593a792c32095c2e885665ec91bb4019d.tar.bz2
mana-fa2f3ac593a792c32095c2e885665ec91bb4019d.tar.xz
mana-fa2f3ac593a792c32095c2e885665ec91bb4019d.zip
Merged with Aethyra master as of 2009-02-09
Conflicts: A lot of files...
Diffstat (limited to 'po')
-rw-r--r--po/POTFILES.in11
1 files changed, 11 insertions, 0 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in
index f338e665..295a6127 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -15,6 +15,7 @@ src/gui/equipmentwindow.cpp
src/gui/help.cpp
src/gui/inventorywindow.cpp
src/gui/item_amount.cpp
+src/gui/itempopup.cpp
src/gui/login.cpp
src/gui/menuwindow.cpp
src/gui/minimap.cpp
@@ -24,6 +25,8 @@ src/gui/npcstringdialog.cpp
src/gui/npc_text.cpp
src/gui/ok_dialog.cpp
src/gui/popupmenu.cpp
+src/gui/recorder.cpp
+src/gui/recorder.h
src/gui/register.cpp
src/gui/sell.cpp
src/gui/setup_audio.cpp
@@ -38,6 +41,13 @@ src/gui/speechbubble.cpp
src/gui/status.cpp
src/gui/trade.cpp
src/gui/updatewindow.cpp
+src/net/buysellhandler.cpp
+src/net/charserverhandler.cpp
+src/net/chathandler.cpp
+src/net/equipmenthandler.cpp
+src/net/inventoryhandler.cpp
+src/net/loginhandler.cpp
+src/net/maploginhandler.cpp
src/net/playerhandler.cpp
src/net/tradehandler.cpp
src/resources/colordb.cpp
@@ -47,5 +57,6 @@ src/resources/monsterdb.cpp
src/resources/npcdb.cpp
src/being.cpp
src/game.cpp
+src/keyboardconfig.cpp
src/main.cpp
src/party.cpp