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

Merge remote-tracking branch 'keepassx/master'

Browse source 
# Conflicts:
#	README.md
#	share/translations/keepassx_de.ts
#	src/CMakeLists.txt
#	src/gui/MainWindow.h
This commit is contained in:
Jonathan White 2016-02-27 19:11:09 -05:00
commit aba4fa94be
244 changed files with 17683 additions and 6918 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/gui/SettingsWidget.h
View file

@ -39,7 +39,7 @@ class SettingsWidget : public EditWidget
Q_OBJECT
public:
explicit SettingsWidget(QWidget* parent = Q_NULLPTR);
explicit SettingsWidget(QWidget* parent = nullptr);
~SettingsWidget();
void addSettingsPage(ISettingsPage * page);
void loadSettings();