From 98e59215b897526cf3c4639381e82076abf4ca56 Mon Sep 17 00:00:00 2001
From: Felix Geyer <debfx@fobos.de>
Date: Fri, 29 Mar 2013 09:46:03 +0100
Subject: [PATCH] Bump version and update changelog.

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

diff --git a/CHANGELOG b/CHANGELOG
index d0f86cf36..3df42bb75 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,12 @@
+2.0 Alpha 4 (2013-03-29)
+=========================
+
+- Add random password generator [#52]
+- Merge the 'Description' tab into the 'Entry' tab [#59]
+- Fix crash when deleting history items [#56]
+- Fix crash on Mac OS X Mountain Lion during startup [#50]
+- Improved KeePassX application icon [#58]
+
 2.0 Alpha 3 (2012-10-27)
 =========================
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 02f336fe4..88398bdb3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,8 +28,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" OFF)
 
-set(KEEPASSX_VERSION "2.0 alpha 3")
-set(KEEPASSX_VERSION_NUM "1.9.82")
+set(KEEPASSX_VERSION "2.0 alpha 4")
+set(KEEPASSX_VERSION_NUM "1.9.83")
 
 if("${CMAKE_C_COMPILER}" MATCHES "clang$" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")
   set(CMAKE_COMPILER_IS_CLANG 1)