Merge branch restore_backup
authorOlivier Goffart <ogoffart@woboq.com>
Wed, 10 Feb 2016 16:47:06 +0000 (17:47 +0100)
committerOlivier Goffart <ogoffart@woboq.com>
Wed, 10 Feb 2016 16:47:06 +0000 (17:47 +0100)
commitc93ecfbfb5a2b9c7278e4838125bdcebf6dce4df
tree6ff462c28da465595d2df667b9104379b12f3e98
parent41d8d77535e39644c84756775bb703e469032115
parent1bb76f534391c6f3f0709a2297b9ae6700b46efd
Merge branch restore_backup
src/gui/folder.cpp
src/gui/folder.h
src/libsync/syncengine.cpp