summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/txt-converter/Makefile.in2
2 files changed, 4 insertions, 0 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 744f6da3e..f1962e064 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -3,6 +3,8 @@ Date Added
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
+2008/10/16
+ * Added missing char_sql/int_mercenary files to txt-converter's Makefile.in. [FlavioJS]
2008/10/15
* Fixed ipban sql connecting to the sql server when disabled. [FlavioJS]
2008/10/11
diff --git a/src/txt-converter/Makefile.in b/src/txt-converter/Makefile.in
index 41c773d31..089d9d276 100644
--- a/src/txt-converter/Makefile.in
+++ b/src/txt-converter/Makefile.in
@@ -39,6 +39,7 @@ CHAR_CONVERTER_OBJ = \
obj_char/sql-inter.o \
obj_char/sql-int_party.o \
obj_char/sql-int_guild.o \
+ obj_char/sql-int_mercenary.o \
../common/obj_all/minicore.o \
../common/obj_all/malloc.o \
../common/obj_all/strlib.o \
@@ -62,6 +63,7 @@ CHAR_CONVERTER_H = \
../char_sql/inter.h \
../char_sql/int_party.h \
../char_sql/int_guild.h \
+ ../char_sql/int_mercenary.h \
../common/cbasetypes.h \
../common/mmo.h \
../common/core.h \