From 2d548d56c2cb5c4018994a9e3bae306bdf35f38f Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Mon, 22 Jun 2009 19:45:53 +0200
Subject: finishing touches for 4.2.0

---
 ChangeLog | 1 +
 1 file changed, 1 insertion(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 1da8a4ce..e59acf00 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 Version 4.2.0  [v4-stable] (rgerhards), 2009-06-23
 - bugfix: light and full delay watermarks had invalid values, badly
   affecting performance for delayable inputs
+- imported all patches from 3.22.1 as of today (see below)
 - bugfix: compile problems in im3195
 ---------------------------------------------------------------------------
 Version 4.1.7  [BETA] (rgerhards), 2009-04-22
-- 
cgit