From b602510cb802238ce2bb94b5c5a0ddd6dbc303b3 Mon Sep 17 00:00:00 2001 From: deajan Date: Wed, 1 Apr 2015 11:04:44 +0200 Subject: [PATCH] Merged v1.00pre into master after successfull testing --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 17a21a6..4becb5b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,8 +32,9 @@ RECENT CHANGES -------------- - 01 Avr. 2015: Osync v1.00pre -- Improved and refactoed the soft deletion routine by merging conflict backup and soft deletion +- Improved and refactored the soft deletion routine by merging conflict backup and soft deletion - Reworked soft deletion code to handle a case where a top level directory gets deleted even if the files contained in it are not old enough (this obviously shouldn't happen on most FS) + - Added more logging - Merged various fixes from onovy (http://github.com/onovy) Thanks! - Lowered sleep time between commands - Check if master and slave directories are the same