Merge branch 'master' into develop

This commit is contained in:
Janek Bevendorff 2020-10-21 22:49:02 +02:00
commit cd519e1bf3
No known key found for this signature in database
GPG key ID: 2FDEB0D40BCA5E11
44 changed files with 3211 additions and 3349 deletions

View file

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