From b613ca49c884fff8ac7adaeaa83e35c41a79c1e0 Mon Sep 17 00:00:00 2001
From: Stefan Verhoeven <s.verhoeven@esciencecenter.nl>
Date: Thu, 11 Feb 2016 09:52:01 +0100
Subject: [PATCH] Bump version to 1.2.0

---
 CHANGELOG.md       | 13 +++++++++++++
 kripodb/version.py |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b2c46e3..01c6989 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,19 @@
 
 ## Unreleased
 
+## 1.2.0 - 11 Feb 2016
+
+### Added
+
+- Prefix to canned fragments lookups (#11)
+- PDB meta data to fragments db (#6)
+- Limit to distance matrix searches (#5)
+
+### Changed
+
+- Merging of distance matrix files more robust (#10)
+- Tanimoto coefficient is rounded up (#7)
+
 ## 1.0.0 - 5 Feb 2016
 
 ### Added
diff --git a/kripodb/version.py b/kripodb/version.py
index dc25090..12047b6 100644
--- a/kripodb/version.py
+++ b/kripodb/version.py
@@ -12,5 +12,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version_info__ = ('1', '1', '0')
+__version_info__ = ('1', '2', '0')
 __version__ = '.'.join(__version_info__)