Olivier Goffart
|
b5ed352aa3
|
Merge remote-tracking branch 'origin/master' into ocsync
Only confluct resolution, do not compile or works
Conflicts:
CMakeLists.txt
CPackConfig.cmake
ConfigureChecks.cmake
client/csync_client.c
cmake/Modules/DefineCompilerFlags.cmake
cmake/Modules/DefineInstallationPaths.cmake
cmake/Modules/FindIconv.cmake
cmake/Modules/FindIniparser.cmake
cmake/Modules/FindNeon.cmake
config.h.cmake
config/CMakeLists.txt
config/ocsync.conf
doc/CMakeLists.txt
modules/csync_owncloud.c
modules/csync_sftp2.c
src/CMakeLists.txt
src/csync.c
src/csync.h
src/csync_config.c
src/csync_exclude.c
src/csync_lock.c
src/csync_macros.h
src/csync_misc.c
src/csync_misc.h
src/csync_private.h
src/csync_propagate.c
src/csync_statedb.c
src/csync_statedb.h
src/csync_update.c
src/csync_util.c
src/csync_util.h
src/std/c_dir.c
src/std/c_file.c
src/std/c_private.h
src/std/c_string.c
src/std/c_string.h
src/std/c_time.c
src/vio/csync_vio.c
src/vio/csync_vio.h
src/vio/csync_vio_file_stat.h
src/vio/csync_vio_local.c
src/vio/csync_vio_method.h
tests/CMakeLists.txt
tests/csync_tests/check_csync_statedb_load.c
tests/csync_tests/check_csync_statedb_query.c
tests/csync_tests/check_csync_treewalk.c
tests/csync_tests/check_csync_update.c
tests/ownCloud/HTTP/DAV.pm
tests/ownCloud/ownCloud/Test.pm
tests/std_tests/check_std_c_str.c
tests/vio_tests/check_vio.c
|
2013-08-18 16:21:18 +02:00 |
|
Klaas Freitag
|
fe706dc8f9
|
cmake: Check for existing header file in neon cmake module.
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
|
2013-07-23 07:52:49 +02:00 |
|
Andreas Schneider
|
9382a047ae
|
cmake: Update FindNeon and add support for version checking.
|
2013-07-12 11:57:07 +02:00 |
|
Daniel Molkentin
|
2b8925c210
|
FindNeon: Work on non-xbuilds as well
|
2013-02-08 16:08:29 +03:00 |
|
Daniel Molkentin
|
79159ae32c
|
Remove debug line
|
2013-02-08 15:56:26 +03:00 |
|
Daniel Molkentin
|
a6f63aea94
|
Safely detect neon-config in cross builds
|
2013-02-08 15:46:42 +03:00 |
|
Klaas Freitag
|
ba21a9b3a2
|
Check if neon was built with LFS support.
|
2013-01-09 15:03:20 +01:00 |
|
Dominik Schmidt
|
e5a9d64353
|
Simplify FindNeon.cmake
|
2012-04-14 03:13:28 +02:00 |
|
Andreas Schneider
|
f0f36120ad
|
module: Build the webdav module.
|
2012-02-22 18:23:17 +01:00 |
|