diff options
| author | Szczepan Zalega <szczepan@nitrokey.com> | 2018-04-10 09:13:51 +0200 | 
|---|---|---|
| committer | Szczepan Zalega <szczepan@nitrokey.com> | 2018-04-10 09:13:51 +0200 | 
| commit | 7c50b1a7f3802178395ba3b378bb6270654c6e67 (patch) | |
| tree | fba8ebc109229aaeb0df4fda042239edbaa7f617 | |
| parent | 46e70f62bb7ff08b1285afddba98835ea426c7ce (diff) | |
| parent | 76da30534d1ec4342f00ae001f7102bf3a3dad19 (diff) | |
| download | libnitrokey-7c50b1a7f3802178395ba3b378bb6270654c6e67.tar.gz libnitrokey-7c50b1a7f3802178395ba3b378bb6270654c6e67.tar.bz2 | |
Merge branch '98-release_3.3'
Update version to v3.3
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | libnitrokey.pro | 2 | 
2 files changed, 2 insertions, 2 deletions
| diff --git a/CMakeLists.txt b/CMakeLists.txt index 05e20d1..6487e5d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,7 +21,7 @@ IF (UNIX)      ENDIF()  ENDIF() -project(libnitrokey LANGUAGES C CXX VERSION 3.2.0) +project(libnitrokey LANGUAGES C CXX VERSION 3.3.0)  set(CMAKE_CXX_STANDARD 14)  set(CMAKE_CXX_STANDARD_REQUIRED ON)  set(CMAKE_CXX_EXTENSIONS OFF) diff --git a/libnitrokey.pro b/libnitrokey.pro index f72cd6d..ea86294 100644 --- a/libnitrokey.pro +++ b/libnitrokey.pro @@ -7,7 +7,7 @@ CONFIG   += c++14 shared debug  TEMPLATE     = lib  TARGET = nitrokey -VERSION = 3.2 +VERSION = 3.3  QMAKE_TARGET_COMPANY = Nitrokey  QMAKE_TARGET_PRODUCT = libnitrokey  QMAKE_TARGET_DESCRIPTION = Communicate with Nitrokey stick devices in a clean and easy manner | 
