Klaas Freitag 162acc1cc2 Fix conflict file handling, create a proper conflict file name. ... Before this fix, the conflict file name was set in the file name variable which lead to the problem that the subsequent rename of the temp file to the final final filename was moving the temp file on the conflict file. No final file was there.		2013-11-07 16:53:22 +01:00
..
3rdparty	Add c_jhash.h header from csync to 3rdparty.	2013-10-03 16:41:23 +02:00
creds	Minor code cleanups-	2013-09-11 10:49:10 +02:00
mirall	Fix conflict file handling, create a proper conflict file name.	2013-11-07 16:53:22 +01:00
owncloudcmd	Merge branch 'propagator-job'	2013-10-28 16:26:25 +01:00
wizard	Fix literal occurances of "ownCloud" in GUI	2013-10-10 11:35:22 +02:00
CMakeLists.txt	Need inotify on FreeBSD for libsync	2013-10-23 01:24:27 +02:00
main.cpp	Wait up to 30 secs before complaining about missing systray	2013-09-10 11:40:02 +02:00