aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2014-11-20 06:48:02 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2014-11-20 06:48:02 +0200
commit558de908345af7680444cab46ffb6080b1000a06 (patch)
tree2ad001e3f4a144c8b159d5095933f6a3d1eae5c4
parent498a16e4f63e12ba3d3ddb365e066d5ce885a8de (diff)
parent46f28dcdf5a72ed430486b562213ad147b65526a (diff)
Merge branch 'master' into bulk
-rw-r--r--odb/version.hxx8
-rw-r--r--version2
2 files changed, 5 insertions, 5 deletions
diff --git a/odb/version.hxx b/odb/version.hxx
index 730dfa0..7e8362b 100644
--- a/odb/version.hxx
+++ b/odb/version.hxx
@@ -26,13 +26,13 @@
// ODB interface version: minor, major, and alpha/beta versions.
//
-#define ODB_VERSION 20303
-#define ODB_VERSION_STR "2.4.a3"
+#define ODB_VERSION 20304
+#define ODB_VERSION_STR "2.4.a4"
// libodb version: interface version plus the bugfix version.
//
-#define LIBODB_VERSION 2039903
-#define LIBODB_VERSION_STR "2.4.0.a3"
+#define LIBODB_VERSION 2039904
+#define LIBODB_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