Olivier Goffart 95edd6a9de Merge remote-tracking branch 'origin/master' into dav ... Conflicts: config/ocsync_log.conf src/csync.c src/csync.h src/csync_config.c src/csync_log.h src/csync_private.h src/csync_statedb.c tests/csync_tests/check_csync_config.c		2012-12-03 17:32:08 +01:00
..
userguide
asciidoc.conf
CMakeLists.txt
codeheader.c
codeheader.h
doxy.config.in
makeguide.sh
makeman.sh
ocsync.1
ocsync.1.txt
ocsync.txt