Klaas Freitag 2bb52ef6f9 Merge branch 'master' into dav - get cmocka tests and database move. ...

Conflicts:
	CMakeLists.txt
	cmake/Modules/FindCMocka.cmake
	src/csync.c
	src/csync_exclude.c
	src/csync_reconcile.c
	src/csync_statedb.c
	src/csync_update.c
	src/csync_util.c
	src/vio/csync_vio.c
	tests/CMakeLists.txt
	tests/csync_tests/check_csync_exclude.c
	tests/csync_tests/check_csync_statedb_load.c
	tests/csync_tests/check_csync_statedb_query.c
	tests/csync_tests/check_csync_update.c
	tests/std_tests/check_std_c_path.c

2012-10-27 19:27:14 +02:00

..

userguide

doc: Fix typos in userguide.

2012-10-07 12:22:16 +02:00

asciidoc.conf

Add user guide.

2008-09-03 13:38:45 +02:00

CMakeLists.txt

Fixed rename to ocsync in doc subdir.

2012-10-05 14:54:13 +02:00

codeheader.c

Fix the vim modlines.

2009-05-13 10:12:07 +02:00

codeheader.h

Fix the vim modlines.

2009-05-13 10:12:07 +02:00

doxy.config.in

Update doxygen generation.

2008-08-20 18:58:17 +02:00

makeguide.sh

Add user guide.

2008-09-03 13:38:45 +02:00

makeman.sh

Add user guide.

2008-09-03 13:38:45 +02:00

ocsync.1

Fixed rename to ocsync in doc subdir.

2012-10-05 14:54:13 +02:00

ocsync.1.txt

Fixed rename to ocsync in doc subdir.

2012-10-05 14:54:13 +02:00

ocsync.txt

Merge branch 'master' into dav - get cmocka tests and database move.

2012-10-27 19:27:14 +02:00