aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2011-08-22 14:59:11 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2011-08-22 14:59:11 +0200
commit7b891574114afbdafc16850b3b11e8cd6b01ef93 (patch)
tree08c9be0d80beff1339541d8705ca443d7a04de64
parentfc0acda2f0a9f27b490df84de2580306942e42ea (diff)
Bump version to 1.6.0.a11.6.0.a1
-rw-r--r--odb/qt/version.hxx6
-rw-r--r--odb/qt/version.options2
-rw-r--r--version2
3 files changed, 5 insertions, 5 deletions
diff --git a/odb/qt/version.hxx b/odb/qt/version.hxx
index 188ec11..fcb5691 100644
--- a/odb/qt/version.hxx
+++ b/odb/qt/version.hxx
@@ -29,15 +29,15 @@
// Check that we have compatible ODB version.
//
-#if ODB_VERSION != 10600
+#if ODB_VERSION != 10501
# error incompatible odb interface version detected
#endif
// libodb-qt version: odb interface version plus the bugfix
// version.
//
-#define LIBODB_QT_VERSION 1060000
-#define LIBODB_QT_VERSION_STR "1.6.0"
+#define LIBODB_QT_VERSION 1059901
+#define LIBODB_QT_VERSION_STR "1.6.0.a1"
#include <odb/post.hxx>
diff --git a/odb/qt/version.options b/odb/qt/version.options
index 7a913f3..1eb71c4 100644
--- a/odb/qt/version.options
+++ b/odb/qt/version.options
@@ -8,6 +8,6 @@
#
--hxx-prologue '#include <odb/qt/version.hxx>'
---hxx-prologue '#if LIBODB_QT_VERSION != 1060000 // 1.6.0'
+--hxx-prologue '#if LIBODB_QT_VERSION != 1059901 // 1.6.0.a1'
--hxx-prologue '# error ODB and C++ compilers see different libodb-qt versions'
--hxx-prologue '#endif'
diff --git a/version b/version
index dc1e644..f715635 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.6.0
+1.6.0.a1