Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-10-11 21:10:48 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into feature/yubikey

Browse source
This commit is contained in:
Janek Bevendorff 2017-02-25 01:09:59 +01:00
commit e25e7ff4a2
No known key found for this signature in database
GPG key ID: CFEC2F6850BFFA53
46 changed files with 1724 additions and 872 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/CMakeLists.txt
View file

@ -70,6 +70,7 @@ set(keepassx_SOURCES
format/KeePass2XmlWriter.cpp
gui/AboutDialog.cpp
gui/Application.cpp
gui/CategoryListWidget.cpp
gui/ChangeMasterKeyWidget.cpp
gui/Clipboard.cpp
gui/DatabaseOpenWidget.cpp
@ -134,6 +135,7 @@ set(keepassx_FORMS
gui/ChangeMasterKeyWidget.ui
gui/DatabaseOpenWidget.ui
gui/DatabaseSettingsWidget.ui
gui/CategoryListWidget.ui
gui/EditWidget.ui
gui/EditWidgetIcons.ui
gui/EditWidgetProperties.ui