summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjörn Steinbrink <B.Steinbrink@gmx.de>2005-10-16 13:56:32 +0000
committerBjörn Steinbrink <B.Steinbrink@gmx.de>2005-10-16 13:56:32 +0000
commitc7098a346b948c5c36a551e2f2135b4ef3094125 (patch)
tree9b3193cd1f8426853623538db655561f0b0ae14a
parent59167f0f02dfd2c8463b2f3d93a8ac219dcc012e (diff)
downloadmana-c7098a346b948c5c36a551e2f2135b4ef3094125.tar.gz
mana-c7098a346b948c5c36a551e2f2135b4ef3094125.tar.bz2
mana-c7098a346b948c5c36a551e2f2135b4ef3094125.tar.xz
mana-c7098a346b948c5c36a551e2f2135b4ef3094125.zip
Added two missing files.
-rw-r--r--ChangeLog11
-rw-r--r--src/Makefile.am2
2 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 9df37ffb..49c64ec7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,16 @@
+2005-10-16 Björn Steinbrink <B.Steinbrink@gmx.de>
+
+ * src/Makefile.am: Added two missing files.
+
2005-10-16 Eugenio Favalli <elvenprogrammer@gmail.com>
* The Mana World.dev, src/game.cpp, src/gui/char_select.cpp,
src/gui/char_server.cpp, src/gui/char_server.h, src/gui/connection.cpp,
src/gui/connection.h, src/gui/login.cpp, src/gui/login.h, src/main.cpp,
- src/main.h, src/net/network.cpp, src/net/network.h, src/net/protocol.cpp,
- src/net/protocol.h: The connection should be non-blocking now and fixed
- the problem with sound not being played at startup.
+ src/main.h, src/net/network.cpp, src/net/network.h,
+ src/net/protocol.cpp, src/net/protocol.h: The connection should be
+ non-blocking now and fixed the problem with sound not being played at
+ startup.
2005-10-15 Björn Steinbrink <B.Steinbrink@gmx.de>
diff --git a/src/Makefile.am b/src/Makefile.am
index 8a6b5b9d..d5972741 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -26,6 +26,8 @@ tmw_SOURCES = graphic/spriteset.cpp \
gui/checkbox.h \
gui/confirm_dialog.cpp \
gui/confirm_dialog.h \
+ gui/connection.cpp \
+ gui/connection.h \
gui/debugwindow.cpp \
gui/debugwindow.h \
gui/equipmentwindow.cpp \