summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/tools/db-merger.c2
-rw-r--r--version.log6
2 files changed, 6 insertions, 2 deletions
diff --git a/src/tools/db-merger.c b/src/tools/db-merger.c
index 3ce9ede03..918584e58 100644
--- a/src/tools/db-merger.c
+++ b/src/tools/db-merger.c
@@ -1662,7 +1662,7 @@ dbFILE *open_db_read(const char *service, const char *filename, int version)
}
/* Open a database file for reading and check for the version */
-dbFILE *open_db_write(const char *service, const char *filename, uint32 version)
+dbFILE *open_db_write(const char *service, const char *filename, int version)
{
dbFILE *f;
int fd;
diff --git a/version.log b/version.log
index 68e3d9803..9b7af37b7 100644
--- a/version.log
+++ b/version.log
@@ -9,10 +9,14 @@ VERSION_MAJOR="1"
VERSION_MINOR="7"
VERSION_PATCH="14"
VERSION_EXTRA=""
-VERSION_BUILD="1097"
+VERSION_BUILD="1098"
# $Log$
#
+# BUILD : 1.7.14 (1098)
+# BUGS :
+# NOTES : db-merger booboo
+#
# BUILD : 1.7.14 (1097)
# BUGS :
# NOTES : another fix for db-merger and epona2anope