Merge pull request #220 from Nitrokey/bump_version_0.6.3

Bump version to 0.6.3
Nitrokey · Jan 23, 2017 · 843dd51 · 843dd51
2 parents 706d354 + 238d864
commit 843dd51
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Change Log
 
+## [v0.6.3](https://github.com/Nitrokey/nitrokey-app/tree/v0.6.3) (2017-01-23)
+[Full Changelog](https://github.com/Nitrokey/nitrokey-app/compare/v0.6.2...v0.6.3)
+
+**Closed issues:**
+
+- Do not enable new HID protocol for Storage yet [\#218](https://github.com/Nitrokey/nitrokey-app/issues/218)
+- nitrokey-app keeps asking for admin PIN when trying to configure TOTP or HOTP slot [\#211](https://github.com/Nitrokey/nitrokey-app/issues/211)
+
+**Merged pull requests:**
+
+- Disable support of new HID protocol for Storage [\#219](https://github.com/Nitrokey/nitrokey-app/pull/219) ([szszszsz](https://github.com/szszszsz))
+- Debian packaging rules changes [\#217](https://github.com/Nitrokey/nitrokey-app/pull/217) ([szszszsz](https://github.com/szszszsz))
+
 ## [v0.6.2](https://github.com/Nitrokey/nitrokey-app/tree/v0.6.2) (2017-01-03)
 [Full Changelog](https://github.com/Nitrokey/nitrokey-app/compare/v0.6.1...v0.6.2)
 
@@ -9,6 +22,7 @@
 
 **Merged pull requests:**
 
+- Bump version to 0.6.2 [\#216](https://github.com/Nitrokey/nitrokey-app/pull/216) ([szszszsz](https://github.com/szszszsz))
 - Pack union for writing OTP slot data [\#215](https://github.com/Nitrokey/nitrokey-app/pull/215) ([szszszsz](https://github.com/szszszsz))
 - Do not block on waiting for symlink to storage being available [\#213](https://github.com/Nitrokey/nitrokey-app/pull/213) ([szszszsz](https://github.com/szszszsz))
 - Break asking PIN loop when user cancels it [\#212](https://github.com/Nitrokey/nitrokey-app/pull/212) ([szszszsz](https://github.com/szszszsz))

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,7 +4,7 @@ cmake_policy(SET CMP0043 OLD) # cmake --help-policy CMP0043
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/CMake/Modules/")
 
 PROJECT(NitrokeyApp)
-SET(PROJECT_VERSION "0.6.2")
+SET(PROJECT_VERSION "0.6.3")
 
 #Please use either 'cmake -DHAVE_LIBAPPINDICATOR=NO' or 'ccmake' to change this value
 OPTION(HAVE_LIBAPPINDICATOR "Compile support for libappindicator" NO)

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+nitrokey-app (0.6.3) xenial; urgency=low
+
+  * Update to version 0.6.3
+
+ -- Szczepan Zalega <szczepan@nitrokey.com>  Mon, 23 Jan 2017 14:49:39 +0100
+
 nitrokey-app (0.6.2) xenial; urgency=low
 
   * Update to version 0.6.2

diff --git a/src/ui/aboutdialog.h b/src/ui/aboutdialog.h
@@ -4,7 +4,7 @@
 #include "device.h"
 #include <QDialog>
 
-#define GUI_VERSION "0.6.2"
+#define GUI_VERSION "0.6.3"
 
 
 namespace Ui {