summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Friis <peavey@placid.dk>2008-04-19 01:10:45 +0000
committerDennis Friis <peavey@placid.dk>2008-04-19 01:10:45 +0000
commitc3705b2d0e40d4a5ae183fafacb5ad57e5926f47 (patch)
treec85291bcb247a1c14cefc1cd9ebeaad8b9f59ea0
parentf99ed4c4efcaff47c643a2683e489594d759151f (diff)
downloadmana-c3705b2d0e40d4a5ae183fafacb5ad57e5926f47.tar.gz
mana-c3705b2d0e40d4a5ae183fafacb5ad57e5926f47.tar.bz2
mana-c3705b2d0e40d4a5ae183fafacb5ad57e5926f47.tar.xz
mana-c3705b2d0e40d4a5ae183fafacb5ad57e5926f47.zip
Fix a double entry and add missing files.
-rw-r--r--ChangeLog4
-rw-r--r--src/Makefile.am18
2 files changed, 14 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 5fd80897..3465986a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-04-19 Dennis Friis <peavey@placid.dk>
+
+ * src/Makefile.am: Fix a double entry and add missing files.
+
2008-04-19 Yohann Ferreira <bertram@cegetel.net>
* src/main.h, src/main.cpp, src/net/loginhandler.cpp: Made mislogins
diff --git a/src/Makefile.am b/src/Makefile.am
index e4682fa8..4a12e72d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,8 +7,8 @@ tmw_SOURCES = gui/widgets/dropdown.cpp \
gui/widgets/layout.h \
gui/widgets/resizegrip.cpp \
gui/widgets/resizegrip.h \
- gui/widgets/tabbedarea.cpp \
- gui/widgets/tabbedarea.h \
+ gui/widgets/tabbedarea.cpp \
+ gui/widgets/tabbedarea.h \
gui/box.h \
gui/box.cpp \
gui/browserbox.cpp \
@@ -21,6 +21,8 @@ tmw_SOURCES = gui/widgets/dropdown.cpp \
gui/buy.h \
gui/buysell.cpp \
gui/buysell.h \
+ gui/changepassworddialog.cpp \
+ gui/changepassworddialog.h \
gui/chargedialog.cpp \
gui/chargedialog.h \
gui/char_select.cpp \
@@ -155,8 +157,6 @@ tmw_SOURCES = gui/widgets/dropdown.cpp \
net/beinghandler.cpp \
net/buysellhandler.h \
net/buysellhandler.cpp \
- net/chatserver/guild.cpp \
- net/chatserver/guild.h \
net/charserverhandler.h \
net/charserverhandler.cpp \
net/chathandler.h \
@@ -185,6 +185,8 @@ tmw_SOURCES = gui/widgets/dropdown.cpp \
net/network.h \
net/npchandler.cpp \
net/npchandler.h \
+ net/partyhandler.cpp \
+ net/partyhandler.h \
net/playerhandler.cpp \
net/playerhandler.h \
net/protocol.h \
@@ -200,10 +202,10 @@ tmw_SOURCES = gui/widgets/dropdown.cpp \
net/chatserver/chatserver.h \
net/chatserver/internal.cpp \
net/chatserver/internal.h \
- net/chatserver/guild.cpp \
- net/chatserver/guild.h \
- net/chatserver/party.cpp \
- net/chatserver/party.h \
+ net/chatserver/guild.cpp \
+ net/chatserver/guild.h \
+ net/chatserver/party.cpp \
+ net/chatserver/party.h \
net/gameserver/gameserver.cpp \
net/gameserver/gameserver.h \
net/gameserver/internal.cpp \