diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2015-06-25 13:26:04 +0300 |
|---|---|---|
| committer | Olivier Goffart <ogoffart@woboq.com> | 2015-06-25 13:30:52 +0300 |
| commit | 29fecb029ea2f533df52d0c86d93ed633f35d397 (patch) | |
| tree | e5d565dd251839018968c37957f2e77c96cbf25c /src/gui/accountsettings.h | |
| parent | 494f08de8cf316a1f8f74fb1f33965ceb76f2584 (diff) | |
| parent | 13a15a62567c726322f2b7a771706fee76c2753a (diff) | |
Merge remote-tracking branch 'origin/1.8'
Conflicts:
VERSION.cmake
src/gui/accountsettings.cpp
src/gui/accountsettings.h
Diffstat (limited to 'src/gui/accountsettings.h')
| -rw-r--r-- | src/gui/accountsettings.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/accountsettings.h b/src/gui/accountsettings.h index 2f7b73209..dd6438de1 100644 --- a/src/gui/accountsettings.h +++ b/src/gui/accountsettings.h @@ -75,6 +75,7 @@ protected slots: void slotFolderWizardRejected(); void slotDeleteAccount(); void refreshSelectiveSyncStatus(); + void slotForceRemoteDiscoveryOnFolders(); private: void showConnectionLabel( const QString& message, const QString& tooltip = QString() ); |