Merge branch 'master' into develop

This commit is contained in:
Janek Bevendorff 2017-12-13 19:00:04 +01:00
commit 57845851c0
No known key found for this signature in database
GPG key ID: 2FDEB0D40BCA5E11
5 changed files with 2399 additions and 4 deletions

View file

@ -1,4 +1,4 @@
2.2.3 (2017-12-11) 2.2.4 (2017-12-13)
========================= =========================
- Prevent database corruption when locked [#1219] - Prevent database corruption when locked [#1219]

View file

@ -50,7 +50,7 @@ set(CMAKE_AUTOUIC ON)
set(KEEPASSXC_VERSION_MAJOR "2") set(KEEPASSXC_VERSION_MAJOR "2")
set(KEEPASSXC_VERSION_MINOR "2") set(KEEPASSXC_VERSION_MINOR "2")
set(KEEPASSXC_VERSION_PATCH "3") set(KEEPASSXC_VERSION_PATCH "4")
set(KEEPASSXC_VERSION "${KEEPASSXC_VERSION_MAJOR}.${KEEPASSXC_VERSION_MINOR}.${KEEPASSXC_VERSION_PATCH}") set(KEEPASSXC_VERSION "${KEEPASSXC_VERSION_MAJOR}.${KEEPASSXC_VERSION_MINOR}.${KEEPASSXC_VERSION_PATCH}")
# Distribution info # Distribution info

View file

@ -50,7 +50,7 @@
</screenshots> </screenshots>
<releases> <releases>
<release version="2.2.3" date="2017-12-11"> <release version="2.2.4" date="2017-12-13">
<description> <description>
<ul> <ul>
<li>Prevent database corruption when locked [#1219]</li> <li>Prevent database corruption when locked [#1219]</li>

File diff suppressed because it is too large Load diff

View file

@ -1,5 +1,5 @@
name: keepassxc name: keepassxc
version: 2.2.3 version: 2.2.4
grade: stable grade: stable
summary: Community-driven port of the Windows application “KeePass Password Safe” summary: Community-driven port of the Windows application “KeePass Password Safe”
description: | description: |