diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2014-11-20 06:48:16 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2014-11-20 06:48:16 +0200 |
commit | f8fc4f6ab094ba8a2060ce3c297920d89c41ffd5 (patch) | |
tree | 6351555a27e5843bf44c53d8976c81a301654c91 | |
parent | c67e46e198b05530f79e11c86dde63b68a6d5906 (diff) | |
parent | f5826c7da4cc11d46a34e4a5e435cff2730c7263 (diff) |
Merge branch 'master' into bulk
-rw-r--r-- | odb/mysql/version.hxx | 6 | ||||
-rw-r--r-- | version | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/odb/mysql/version.hxx b/odb/mysql/version.hxx index e5289eb..8d257a1 100644 --- a/odb/mysql/version.hxx +++ b/odb/mysql/version.hxx @@ -36,7 +36,7 @@ // Check that we have compatible ODB version. // -#if ODB_VERSION != 20303 +#if ODB_VERSION != 20304 # error incompatible odb interface version detected #endif @@ -49,8 +49,8 @@ // libodb-mysql version: odb interface version plus the bugfix // version. // -#define LIBODB_MYSQL_VERSION 2039903 -#define LIBODB_MYSQL_VERSION_STR "2.4.0.a3" +#define LIBODB_MYSQL_VERSION 2039904 +#define LIBODB_MYSQL_VERSION_STR "2.4.0.a4" #include <odb/post.hxx> @@ -1 +1 @@ -2.4.0.a3 +2.4.0.a4 |