keepassxc/src/gui/dbsettings
Jonathan White 21de6f6163
Merge branch 'develop'
Conflicts:
	src/core/Tools.cpp
	src/sshagent/SSHAgent.cpp
2018-12-30 16:32:57 -05:00
..
DatabaseSettingsDialog.cpp Merge branch 'develop' 2018-12-18 22:28:56 -05:00
DatabaseSettingsDialog.h Merge branch 'develop' 2018-12-18 22:28:56 -05:00
DatabaseSettingsDialog.ui Add a new database settings wizard 2018-09-25 21:12:47 +02:00
DatabaseSettingsWidget.cpp Restore correct formatting 2018-11-28 18:29:15 -05:00
DatabaseSettingsWidget.h Restore correct formatting 2018-11-28 18:29:15 -05:00
DatabaseSettingsWidgetBrowser.cpp Customize buttons on MessageBox and confirm before recycling (#2376) 2018-12-19 23:14:11 -05:00
DatabaseSettingsWidgetBrowser.h Restore correct formatting 2018-11-28 18:29:15 -05:00
DatabaseSettingsWidgetBrowser.ui Multiple macOS fixes and include keepassxc-cli in DMG (#2165) 2018-12-28 18:32:25 -05:00
DatabaseSettingsWidgetEncryption.cpp Restore correct formatting 2018-11-28 18:29:15 -05:00
DatabaseSettingsWidgetEncryption.h Restore correct formatting 2018-11-28 18:29:15 -05:00
DatabaseSettingsWidgetEncryption.ui Add a new database settings wizard 2018-09-25 21:12:47 +02:00
DatabaseSettingsWidgetGeneral.cpp Restore correct formatting 2018-11-28 18:29:15 -05:00
DatabaseSettingsWidgetGeneral.h Restore correct formatting 2018-11-28 18:29:15 -05:00
DatabaseSettingsWidgetGeneral.ui Add a new database settings wizard 2018-09-25 21:12:47 +02:00
DatabaseSettingsWidgetMasterKey.cpp Customize buttons on MessageBox and confirm before recycling (#2376) 2018-12-19 23:14:11 -05:00
DatabaseSettingsWidgetMasterKey.h Restore correct formatting 2018-11-28 18:29:15 -05:00
DatabaseSettingsWidgetMetaDataSimple.cpp Restore correct formatting 2018-11-28 18:29:15 -05:00
DatabaseSettingsWidgetMetaDataSimple.h Restore correct formatting 2018-11-28 18:29:15 -05:00
DatabaseSettingsWidgetMetaDataSimple.ui Add a new database settings wizard 2018-09-25 21:12:47 +02:00