diff options
| author | Daniel Molkentin <danimo@owncloud.com> | 2014-08-26 13:29:42 +0400 |
|---|---|---|
| committer | Daniel Molkentin <danimo@owncloud.com> | 2014-08-26 13:29:42 +0400 |
| commit | 902bb7a198c2fcefaf2ac741efadfc10d891fac7 (patch) | |
| tree | 956fd1ebb6717878dfa1140084aab06b98fa8b1f /src/gui/accountsettings.ui | |
| parent | 4fc044d368b2fe54f153ff33d761428a6b8f595d (diff) | |
| parent | 03dc27a3271fff5bc8be06e1bd714fbf528a2d69 (diff) | |
Merge remote-tracking branch 'origin/master' into move_lib_to_sep_dir
Conflicts:
src/CMakeLists.txt
src/gui/accountsettings.cpp
src/gui/folderwizard.cpp
src/gui/settingsdialog.cpp
src/libsync/syncengine.h
Diffstat (limited to 'src/gui/accountsettings.ui')
| -rw-r--r-- | src/gui/accountsettings.ui | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/gui/accountsettings.ui b/src/gui/accountsettings.ui index 133dfaab0..e62916ddd 100644 --- a/src/gui/accountsettings.ui +++ b/src/gui/accountsettings.ui @@ -71,6 +71,13 @@ </widget> </item> <item> + <widget class="QPushButton" name="_buttonSelectiveSync"> + <property name="text"> + <string>Selective Sync...</string> + </property> + </widget> + </item> + <item> <spacer name="verticalSpacer_3"> <property name="orientation"> <enum>Qt::Vertical</enum> |