Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-08-08 14:32:39 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'release/2.1.2' into develop

Browse source
This commit is contained in:
Janek Bevendorff 2017-02-17 04:03:12 +01:00
commit e0e6f2b8e9
No known key found for this signature in database
GPG key ID: CFEC2F6850BFFA53
70 changed files with 7701 additions and 723 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/gui/DatabaseWidget.h
View file

@ -138,7 +138,7 @@ public Q_SLOTS:
void switchToView(bool accepted);
void switchToEntryEdit();
void switchToGroupEdit();
void switchToMasterKeyChange();
void switchToMasterKeyChange(bool disableCancel = false);
void switchToDatabaseSettings();
void switchToOpenDatabase(const QString& fileName);
void switchToOpenDatabase(const QString& fileName, const QString& password, const QString& keyFile);