Merge branch 'master' into develop

This commit is contained in:
Janek Bevendorff 2020-01-19 21:44:25 +01:00
commit b2fd7f6d54
No known key found for this signature in database
GPG key ID: 2FDEB0D40BCA5E11
26 changed files with 238 additions and 121 deletions

View file

@ -100,7 +100,7 @@ endif()
set(KEEPASSXC_VERSION_MAJOR "2")
set(KEEPASSXC_VERSION_MINOR "5")
set(KEEPASSXC_VERSION_PATCH "2")
set(KEEPASSXC_VERSION_PATCH "3")
set(KEEPASSXC_VERSION "${KEEPASSXC_VERSION_MAJOR}.${KEEPASSXC_VERSION_MINOR}.${KEEPASSXC_VERSION_PATCH}")
set(OVERRIDE_VERSION "" CACHE STRING "Override the KeePassXC Version for Snapshot builds")