aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2014-11-20 06:48:19 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2014-11-20 06:48:19 +0200
commit05a56a60151fe4540cda401e7bb630f91aa8380e (patch)
tree8aed2b01e504f7bec147e4fefa461d402bcaf818
parentefebd5ea2e6b0cf4e272614075c8346c0ef16cba (diff)
parent3bb29e43f60229bcac00777c839174703f848c16 (diff)
Merge branch 'master' into bulk
-rw-r--r--odb/sqlite/version.hxx6
-rw-r--r--version2
2 files changed, 4 insertions, 4 deletions
diff --git a/odb/sqlite/version.hxx b/odb/sqlite/version.hxx
index f5dfbeb..c6ac475 100644
--- a/odb/sqlite/version.hxx
+++ b/odb/sqlite/version.hxx
@@ -28,15 +28,15 @@
// Check that we have compatible ODB version.
//
-#if ODB_VERSION != 20303
+#if ODB_VERSION != 20304
# error incompatible odb interface version detected
#endif
// libodb-sqlite version: odb interface version plus the bugfix
// version.
//
-#define LIBODB_SQLITE_VERSION 2039903
-#define LIBODB_SQLITE_VERSION_STR "2.4.0.a3"
+#define LIBODB_SQLITE_VERSION 2039904
+#define LIBODB_SQLITE_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