Olivier Goffart
|
9f5388544a
|
Fix cmake after merge
iniparser dependency is gone.
|
2013-08-18 16:29:35 +02:00 |
|
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
|
0c3becfdb6
|
cmake: Fix make install on win32 platform.
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
|
2013-07-23 07:41:41 +02:00 |
|
Klaas Freitag
|
e7837c0716
|
Fixed rename to ocsync in doc subdir.
|
2012-10-05 14:54:13 +02:00 |
|
Andreas Schneider
|
0634e0fdea
|
Don't require a C++ compiler.
|
2009-03-18 10:55:14 +01:00 |
|
Andreas Schneider
|
7f53e66be4
|
Enable doxygen for developer documentation again.
|
2008-09-10 10:50:49 +02:00 |
|
Andreas Schneider
|
36d164a338
|
Fix the installation path of the user guide.
|
2008-09-10 10:39:43 +02:00 |
|
Andreas Schneider
|
1b8935a857
|
Install the userguide.
|
2008-09-04 10:26:53 +02:00 |
|
Andreas Schneider
|
1119e84d96
|
Add user guide.
|
2008-09-03 13:38:45 +02:00 |
|
Andreas Schneider
|
36ae0468f6
|
Don't autogenerate manpages for now.
|
2008-07-03 11:10:12 +02:00 |
|
Andreas Schneider
|
67efe90536
|
Add a manpage for the csync commandline client.
|
2008-07-02 19:02:27 +02:00 |
|
Andreas Schneider
|
1b29a420bc
|
Initial commit
|
2008-02-27 18:56:47 +01:00 |
|