From 822cb2a6e65a071adf4d0a1626bdb6b176fa010a Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Tue, 15 Mar 2011 12:07:40 +0200
Subject: Bump version to 1.2.0

---
 odb/boost/version.hxx     | 6 +++---
 odb/boost/version.options | 2 +-
 version                   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/odb/boost/version.hxx b/odb/boost/version.hxx
index 5a3d102..23ce154 100644
--- a/odb/boost/version.hxx
+++ b/odb/boost/version.hxx
@@ -29,15 +29,15 @@
 
 // Check that we have compatible ODB version.
 //
-#if ODB_VERSION != 10100
+#if ODB_VERSION != 10200
 #  error incompatible odb interface version detected
 #endif
 
 // libodb-boost version: odb interface version plus the bugfix
 // version.
 //
-#define LIBODB_BOOST_VERSION     1010000
-#define LIBODB_BOOST_VERSION_STR "1.1.0"
+#define LIBODB_BOOST_VERSION     1020000
+#define LIBODB_BOOST_VERSION_STR "1.2.0"
 
 #include <odb/post.hxx>
 
diff --git a/odb/boost/version.options b/odb/boost/version.options
index c551bcb..dc2c51a 100644
--- a/odb/boost/version.options
+++ b/odb/boost/version.options
@@ -8,6 +8,6 @@
 #
 --hxx-prologue '#include <odb/boost/version.hxx>'
 
-#--hxx-prologue '#if LIBODB_BOOST_VERSION != 1010000 // 1.1.0'
+#--hxx-prologue '#if LIBODB_BOOST_VERSION != 1020000 // 1.2.0'
 #--hxx-prologue '#  error ODB and C++ compilers see different libodb-boost versions'
 #--hxx-prologue '#endif'
diff --git a/version b/version
index 9084fa2..26aaba0 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.1.0
+1.2.0
-- 
cgit v1.1