Move csync in order to merge it with mirall

2014-01-13 14:35:36 +01:00 · 2014-01-13 14:35:36 +01:00 · bf7ca60bec
--- a/cmake/modules/AddCMockaTest.cmake
+++ b/cmake/modules/AddCMockaTest.cmake
--- a/cmake/modules/COPYING-CMAKE-SCRIPTS
+++ b/cmake/modules/COPYING-CMAKE-SCRIPTS
--- a/cmake/modules/CheckCCompilerFlagSSP.cmake
+++ b/cmake/modules/CheckCCompilerFlagSSP.cmake
--- a/cmake/modules/CheckPrototypeDefinition.c.in
+++ b/cmake/modules/CheckPrototypeDefinition.c.in
--- a/cmake/modules/CheckPrototypeDefinition.cmake
+++ b/cmake/modules/CheckPrototypeDefinition.cmake
--- a/cmake/modules/DefineCMakeDefaults.cmake
+++ b/cmake/modules/DefineCMakeDefaults.cmake
--- a/cmake/modules/DefineCompilerFlags.cmake
+++ b/cmake/modules/DefineCompilerFlags.cmake
--- a/cmake/modules/DefineInstallationPaths.cmake
+++ b/cmake/modules/DefineInstallationPaths.cmake
--- a/cmake/modules/DefinePlatformDefaults.cmake
+++ b/cmake/modules/DefinePlatformDefaults.cmake
--- a/cmake/modules/FindCMocka.cmake
+++ b/cmake/modules/FindCMocka.cmake
--- a/cmake/modules/FindIconv.cmake
+++ b/cmake/modules/FindIconv.cmake
--- a/cmake/modules/FindLibSSH.cmake
+++ b/cmake/modules/FindLibSSH.cmake
--- a/cmake/modules/FindNeon.cmake
+++ b/cmake/modules/FindNeon.cmake
--- a/cmake/modules/FindOpenSSLCross.cmake
+++ b/cmake/modules/FindOpenSSLCross.cmake
--- a/cmake/modules/FindPackageVersionCheck.cmake
+++ b/cmake/modules/FindPackageVersionCheck.cmake
--- a/cmake/modules/FindSMBClient.cmake
+++ b/cmake/modules/FindSMBClient.cmake
--- a/cmake/modules/FindSQLite3.cmake
+++ b/cmake/modules/FindSQLite3.cmake
--- a/cmake/modules/GNUInstallDirs.cmake
+++ b/cmake/modules/GNUInstallDirs.cmake
--- a/cmake/modules/MacroAddCompileFlags.cmake
+++ b/cmake/modules/MacroAddCompileFlags.cmake
--- a/cmake/modules/MacroAddLinkFlags.cmake
+++ b/cmake/modules/MacroAddLinkFlags.cmake
--- a/cmake/modules/MacroAddPlugin.cmake
+++ b/cmake/modules/MacroAddPlugin.cmake
--- a/cmake/modules/MacroCopyFile.cmake
+++ b/cmake/modules/MacroCopyFile.cmake
--- a/cmake/modules/MacroEnsureOutOfSourceBuild.cmake
+++ b/cmake/modules/MacroEnsureOutOfSourceBuild.cmake
--- a/cmake/modules/UseAsciidoc.cmake
+++ b/cmake/modules/UseAsciidoc.cmake
--- a/cmake/modules/UseDoxygen.cmake
+++ b/cmake/modules/UseDoxygen.cmake
--- a/cmake/scripts/generate_findpackage_file
+++ b/cmake/scripts/generate_findpackage_file
--- a/cmake/scripts/generate_lib_file
+++ b/cmake/scripts/generate_lib_file
--- a/csync/AUTHORS
+++ b/csync/AUTHORS
--- a/csync/CMakeLists.txt
+++ b/csync/CMakeLists.txt
--- a/csync/COPYING
+++ b/csync/COPYING
--- a/csync/CTestConfig.cmake
+++ b/csync/CTestConfig.cmake
--- a/csync/CTestCustom.cmake
+++ b/csync/CTestCustom.cmake
--- a/csync/ChangeLog
+++ b/csync/ChangeLog
--- a/csync/ConfigureChecks.cmake
+++ b/csync/ConfigureChecks.cmake
--- a/csync/DefineOptions.cmake
+++ b/csync/DefineOptions.cmake
--- a/csync/INSTALL
+++ b/csync/INSTALL
--- a/csync/README
+++ b/csync/README
--- a/csync/doc/CMakeLists.txt
+++ b/csync/doc/CMakeLists.txt
--- a/csync/doc/asciidoc.conf
+++ b/csync/doc/asciidoc.conf
--- a/csync/doc/codeheader.c
+++ b/csync/doc/codeheader.c
--- a/csync/doc/codeheader.h
+++ b/csync/doc/codeheader.h
--- a/csync/doc/doxy.config.in
+++ b/csync/doc/doxy.config.in
--- a/csync/doc/makeguide.sh
+++ b/csync/doc/makeguide.sh
--- a/csync/doc/makeman.sh
+++ b/csync/doc/makeman.sh
--- a/csync/doc/ocsync.1
+++ b/csync/doc/ocsync.1
--- a/csync/doc/ocsync.1.txt
+++ b/csync/doc/ocsync.1.txt
--- a/csync/doc/ocsync.txt
+++ b/csync/doc/ocsync.txt
--- a/csync/doc/userguide/csync.html
+++ b/csync/doc/userguide/csync.html
--- a/csync/doc/userguide/images/icons/README
+++ b/csync/doc/userguide/images/icons/README
--- a/csync/doc/userguide/images/icons/callouts/1.png
+++ b/csync/doc/userguide/images/icons/callouts/1.png
--- a/csync/doc/userguide/images/icons/callouts/10.png
+++ b/csync/doc/userguide/images/icons/callouts/10.png
--- a/csync/doc/userguide/images/icons/callouts/11.png
+++ b/csync/doc/userguide/images/icons/callouts/11.png
--- a/csync/doc/userguide/images/icons/callouts/12.png
+++ b/csync/doc/userguide/images/icons/callouts/12.png
--- a/csync/doc/userguide/images/icons/callouts/13.png
+++ b/csync/doc/userguide/images/icons/callouts/13.png
--- a/csync/doc/userguide/images/icons/callouts/14.png
+++ b/csync/doc/userguide/images/icons/callouts/14.png
--- a/csync/doc/userguide/images/icons/callouts/15.png
+++ b/csync/doc/userguide/images/icons/callouts/15.png
--- a/csync/doc/userguide/images/icons/callouts/2.png
+++ b/csync/doc/userguide/images/icons/callouts/2.png
--- a/csync/doc/userguide/images/icons/callouts/3.png
+++ b/csync/doc/userguide/images/icons/callouts/3.png
--- a/csync/doc/userguide/images/icons/callouts/4.png
+++ b/csync/doc/userguide/images/icons/callouts/4.png
--- a/csync/doc/userguide/images/icons/callouts/5.png
+++ b/csync/doc/userguide/images/icons/callouts/5.png
--- a/csync/doc/userguide/images/icons/callouts/6.png
+++ b/csync/doc/userguide/images/icons/callouts/6.png
--- a/csync/doc/userguide/images/icons/callouts/7.png
+++ b/csync/doc/userguide/images/icons/callouts/7.png
--- a/csync/doc/userguide/images/icons/callouts/8.png
+++ b/csync/doc/userguide/images/icons/callouts/8.png
--- a/csync/doc/userguide/images/icons/callouts/9.png
+++ b/csync/doc/userguide/images/icons/callouts/9.png
--- a/csync/doc/userguide/images/icons/caution.png
+++ b/csync/doc/userguide/images/icons/caution.png
--- a/csync/doc/userguide/images/icons/example.png
+++ b/csync/doc/userguide/images/icons/example.png
--- a/csync/doc/userguide/images/icons/home.png
+++ b/csync/doc/userguide/images/icons/home.png
--- a/csync/doc/userguide/images/icons/important.png
+++ b/csync/doc/userguide/images/icons/important.png
--- a/csync/doc/userguide/images/icons/next.png
+++ b/csync/doc/userguide/images/icons/next.png
--- a/csync/doc/userguide/images/icons/note.png
+++ b/csync/doc/userguide/images/icons/note.png
--- a/csync/doc/userguide/images/icons/prev.png
+++ b/csync/doc/userguide/images/icons/prev.png
--- a/csync/doc/userguide/images/icons/tip.png
+++ b/csync/doc/userguide/images/icons/tip.png
--- a/csync/doc/userguide/images/icons/up.png
+++ b/csync/doc/userguide/images/icons/up.png
--- a/csync/doc/userguide/images/icons/warning.png
+++ b/csync/doc/userguide/images/icons/warning.png
--- a/csync/src/CMakeLists.txt
+++ b/csync/src/CMakeLists.txt
--- a/csync/src/csync.c
+++ b/csync/src/csync.c
--- a/csync/src/csync.h
+++ b/csync/src/csync.h
--- a/csync/src/csync_config.c
+++ b/csync/src/csync_config.c
--- a/csync/src/csync_config.h
+++ b/csync/src/csync_config.h
--- a/csync/src/csync_dbtree.c
+++ b/csync/src/csync_dbtree.c
--- a/csync/src/csync_dbtree.h
+++ b/csync/src/csync_dbtree.h
--- a/csync/src/csync_exclude.c
+++ b/csync/src/csync_exclude.c
--- a/csync/src/csync_exclude.h
+++ b/csync/src/csync_exclude.h
--- a/csync/src/csync_lock.c
+++ b/csync/src/csync_lock.c
--- a/csync/src/csync_lock.h
+++ b/csync/src/csync_lock.h
--- a/csync/src/csync_log.c
+++ b/csync/src/csync_log.c
--- a/csync/src/csync_log.h
+++ b/csync/src/csync_log.h
--- a/csync/src/csync_macros.h
+++ b/csync/src/csync_macros.h
--- a/csync/src/csync_misc.c
+++ b/csync/src/csync_misc.c
--- a/csync/src/csync_misc.h
+++ b/csync/src/csync_misc.h
--- a/csync/src/csync_owncloud.c
+++ b/csync/src/csync_owncloud.c
--- a/csync/src/csync_owncloud.h
+++ b/csync/src/csync_owncloud.h
--- a/csync/src/csync_owncloud_recursive_propfind.c
+++ b/csync/src/csync_owncloud_recursive_propfind.c
--- a/csync/src/csync_owncloud_util.c
+++ b/csync/src/csync_owncloud_util.c
--- a/csync/src/csync_private.h
+++ b/csync/src/csync_private.h
--- a/csync/src/csync_reconcile.c
+++ b/csync/src/csync_reconcile.c
--- a/csync/src/csync_reconcile.h
+++ b/csync/src/csync_reconcile.h
--- a/csync/src/csync_rename.cc
+++ b/csync/src/csync_rename.cc
--- a/csync/src/csync_rename.h
+++ b/csync/src/csync_rename.h
--- a/csync/src/csync_statedb.c
+++ b/csync/src/csync_statedb.c
--- a/Показать больше
+++ b/Показать больше