aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2014-11-20 06:48:22 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2014-11-20 06:48:22 +0200
commitdc8f35f68d87390c91b30dbdf148b09ab2081745 (patch)
tree12edb1c29efdfac871a2f9d7e7c066e9fffc854b
parentc998d05c355518ba3b7e27f6833e00684d9c5764 (diff)
parent40052e8f41978087836d04a37d1dd86552e16b7b (diff)
Merge branch 'master' into bulk
-rw-r--r--odb/oracle/version.hxx6
-rw-r--r--version2
2 files changed, 4 insertions, 4 deletions
diff --git a/odb/oracle/version.hxx b/odb/oracle/version.hxx
index 4280be8..0671242 100644
--- a/odb/oracle/version.hxx
+++ b/odb/oracle/version.hxx
@@ -29,15 +29,15 @@
// Check that we have compatible ODB version.
//
-#if ODB_VERSION != 20303
+#if ODB_VERSION != 20304
# error incompatible odb interface version detected
#endif
// libodb-oracle version: odb interface version plus the bugfix
// version.
//
-#define LIBODB_ORACLE_VERSION 2039903
-#define LIBODB_ORACLE_VERSION_STR "2.4.0.a3"
+#define LIBODB_ORACLE_VERSION 2039904
+#define LIBODB_ORACLE_VERSION_STR "2.4.0.a4"
#include <odb/post.hxx>
diff --git a/version b/version
index 26d9ac3..42645da 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2.4.0.a3
+2.4.0.a4