From 467c082368120d824d94aa4be03fc6f5e582d291 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <mail@cynapses.org>
Date: Tue, 10 Feb 2009 12:50:26 +0100
Subject: [PATCH] Set version to 0.42.0.

---
 ChangeLog                | 3 +++
 doc/userguide/csync.html | 6 +++---
 src/csync.h              | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6868ceabd..31d6958af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
 ChangeLog
 ==========
 
+version 0.42.0 (released 2009-02-10)
+  * Small fix in the userguide.
+
 version 0.42.0 rc3 (released 2009-01-23)
   libcsync:
   * Added checks for unix extensions.
diff --git a/doc/userguide/csync.html b/doc/userguide/csync.html
index cf77c95a0..529b77fd4 100644
--- a/doc/userguide/csync.html
+++ b/doc/userguide/csync.html
@@ -484,8 +484,8 @@ information.</p></div>
 <div class="paragraph"><p>The goal is to detect conflicting updates (files which have been modified) and
 propagate non-conflicting updates to each replica. If there are no conflicts
 left, we are done, and the replicas are identical. To resolve or handle
-conflicts there are several algorithms available. They are discussed later in
-this documents.</p></div>
+conflicts there are several algorithms available. They will be discussed
+one of the following sections.</p></div>
 </div>
 <h2 id="_basics">2. Basics</h2>
 <div class="sectionbody">
@@ -821,7 +821,7 @@ directory).</p></div>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2009-01-20 17:03:10 CEST
+Last updated 2009-02-10 12:48:31 CEST
 </div>
 </div>
 </body>
diff --git a/src/csync.h b/src/csync.h
index e6bf20811..dee70725e 100644
--- a/src/csync.h
+++ b/src/csync.h
@@ -43,7 +43,7 @@ extern "C" {
 #define CSYNC_VERSION_MAJOR 0
 #define CSYNC_VERSION_MINOR 42
 #define CSYNC_VERSION_PATCH 0
-#define CSYNC_VERSION_STRING "csync version 0.42.0 rc3"
+#define CSYNC_VERSION_STRING "csync version 0.42.0"
 
 /*
  * csync file declarations