Daniel Molkentin 902bb7a198 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		2014-08-26 11:29:42 +02:00
..
modules	Merge remote-tracking branch 'origin/master' into move_lib_to_sep_dir	2014-08-26 11:29:42 +02:00
scripts	Move csync in order to merge it with mirall	2014-01-13 14:39:50 +01:00