aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2014-11-20 06:48:21 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2014-11-20 06:48:21 +0200
commitccc42660af3449d7e30c263014be67bbebab2964 (patch)
tree020ee91d3d654aed1ef9a90b6e91384d552f8021
parent71ba806ccdf7627ca80b65b5ab98cf4b1c6aa575 (diff)
parent1ca674f0dda6ea6f1204f0c06e22e165655927c3 (diff)
Merge branch 'master' into bulk
-rw-r--r--odb/pgsql/version.hxx6
-rw-r--r--version2
2 files changed, 4 insertions, 4 deletions
diff --git a/odb/pgsql/version.hxx b/odb/pgsql/version.hxx
index 7bf01a9..e710413 100644
--- a/odb/pgsql/version.hxx
+++ b/odb/pgsql/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-pgsql version: odb interface version plus the bugfix
// version.
//
-#define LIBODB_PGSQL_VERSION 2039903
-#define LIBODB_PGSQL_VERSION_STR "2.4.0.a3"
+#define LIBODB_PGSQL_VERSION 2039904
+#define LIBODB_PGSQL_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