diff options
author | Jonathan White <support@dmapps.us> | 2017-04-09 17:28:15 +0300 |
---|---|---|
committer | Jonathan White <support@dmapps.us> | 2017-04-09 17:28:15 +0300 |
commit | 3de4395d5e1b02d05b145dd42172bde56de5ebe0 (patch) | |
tree | 025c0ed9abe7cf1277a24ecd8ebba559de6b63ea /CMakeLists.txt | |
parent | 047fe9a4221c0f30f70a0fd316fe53b5aee4e90c (diff) | |
parent | cb283bb95ae559d044415f426f841c27bff383f0 (diff) |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 56baa8f81..1b5e94ae0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,8 +39,8 @@ option(WITH_XC_AUTOTYPE "Include Auto-Type." ON) option(WITH_XC_HTTP "Include KeePassHTTP and Custom Icon Downloads." OFF) option(WITH_XC_YUBIKEY "Include YubiKey support." OFF) -set(KEEPASSXC_VERSION "2.1.3") -set(KEEPASSXC_VERSION_NUM "2.1.3") +set(KEEPASSXC_VERSION "2.1.4") +set(KEEPASSXC_VERSION_NUM "2.1.4") if("${CMAKE_C_COMPILER}" MATCHES "clang$" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang") set(CMAKE_COMPILER_IS_CLANG 1) |