diff options
| author | Jonathan White <support@dmapps.us> | 2018-08-24 15:40:41 +0300 |
|---|---|---|
| committer | Jonathan White <support@dmapps.us> | 2018-08-24 16:42:38 +0300 |
| commit | ca27fb06d5aa69b0ad079552a12b66ad4c364828 (patch) | |
| tree | 08f1a302952b5073e51a392351e5842427bbba9c /CMakeLists.txt | |
| parent | 8b5530d2ba4e1803f3506d7d7b75c1168b21eb3d (diff) | |
| parent | 6fe821c30ec747e7fda0a8abe75d774d61a21054 (diff) | |
Merge branch 'master'
Conflicts:
INSTALL.md
release-tool
src/browser/BrowserOptionDialog.cpp
src/browser/BrowserService.cpp
src/browser/BrowserService.h
src/browser/NativeMessagingBase.h
src/browser/NativeMessagingHost.h
src/core/Uuid.cpp
src/gui/DatabaseTabWidget.cpp
src/gui/DatabaseWidget.cpp
src/gui/EditWidget.cpp
src/gui/MainWindow.cpp
src/gui/MainWindow.ui
src/proxy/NativeMessagingHost.h
src/sshagent/ASN1Key.cpp
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index dfba16788..5cac3cc9d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,7 +62,7 @@ set(CMAKE_AUTOUIC ON) set(KEEPASSXC_VERSION_MAJOR "2") set(KEEPASSXC_VERSION_MINOR "3") -set(KEEPASSXC_VERSION_PATCH "3") +set(KEEPASSXC_VERSION_PATCH "4") set(KEEPASSXC_VERSION "${KEEPASSXC_VERSION_MAJOR}.${KEEPASSXC_VERSION_MINOR}.${KEEPASSXC_VERSION_PATCH}") set(KEEPASSXC_BUILD_TYPE "Snapshot" CACHE STRING "Set KeePassXC build type to distinguish between stable releases and snapshots") |