From aabe735f6c4c5f608aedd510b0b17d7372c18b2b Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Fri, 5 Sep 2003 12:46:03 +0200
Subject: [PATCH] Updated VIVA, VIVA Plus, MTV Central and MTV 2 in
 channels.conf

---
 CONTRIBUTORS | 3 +++
 HISTORY      | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 068a7b8a..a23b5396 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -782,3 +782,6 @@ Peter Waechtler <pwaechtler@mac.com>
 
 Robert Bartl <robert@bartl.priv.at>
  for reporting a hangup in SVDRP when the client disappears without sending QUIT
+
+Sebastian Frei <sebastian@schnapsleichen.de>
+ for his support in keeping 'channels.conf' up-to-date.
diff --git a/HISTORY b/HISTORY
index f246ab56..84083142 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2352,3 +2352,9 @@ Video Disk Recorder Revision History
 - Actually implemented the SVDRP command DELC.
 - Now clearing the player device if there are too many poll timeouts in 'Transfer
   Mode', which avoids buffer overflows and black screens in such cases.
+
+2003-09-05: Version 1.2.5pre2
+
+- Updated VIVA, VIVA Plus, MTV Central and MTV 2 in channels.conf (thanks to
+  Sebastian Frei).
+