From 1226d1dbd59c003eabdcca33417ee295e9a27c94 Mon Sep 17 00:00:00 2001
From: Felix Geyer <debfx@fobos.de>
Date: Sat, 18 Jul 2015 21:12:52 +0200
Subject: [PATCH] Prepare next release.

---
 CHANGELOG      | 14 ++++++++++++++
 CMakeLists.txt |  4 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index b61597b7..baeb5db4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,17 @@
+2.0 Beta 1 (2015-07-18)
+=========================
+
+- Remember entry column sizes [#159]
+- Add translations
+- Support opening attachments directly
+- Support cmd:// URLs [#244]
+- Protect opened databases with a file lock [#18]
+- Export to csv files [#57]
+- Add optional tray icon [#153]
+- Allow setting the default auto-type sequence for groups [#175]
+- Make the kdbx parser more lenient
+- Remove --password command line option [#285]
+
 2.0 Alpha 6 (2014-04-12)
 =========================
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2fef3f42..0272ccd8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,8 +34,8 @@ option(WITH_GUI_TESTS "Enable building of GUI tests" OFF)
 option(WITH_LTO "Enable Link Time Optimization (LTO)" OFF)
 option(WITH_CXX11 "Build with the C++ 11 standard" ON)
 
-set(KEEPASSX_VERSION "2.0 alpha 6")
-set(KEEPASSX_VERSION_NUM "1.9.85")
+set(KEEPASSX_VERSION "2.0 beta 1")
+set(KEEPASSX_VERSION_NUM "1.9.91")
 
 if("${CMAKE_C_COMPILER}" MATCHES "clang$" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")
   set(CMAKE_COMPILER_IS_CLANG 1)