From 9c60e04085bbfe5cf2eb699d0e070efbf1171389 Mon Sep 17 00:00:00 2001
From: Michael Krufky <devnull@localhost>
Date: Wed, 19 Oct 2005 00:45:47 +0000
Subject:         - Tree-merge enabled once again.

        Signed-off-by: Michael Krufky <mkrufky@m1k.net>
---
 v4l/ChangeLog | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'v4l/ChangeLog')

diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 85cbf76be..91af2bc8e 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,11 @@
+2005-10-19 00:44  mkrufky
+
+	* ../v4l/scripts/merge-trees.sh:
+	* ../v4l/scripts/unmerge-trees.sh:
+	- Tree-merge enabled once again.
+
+	Signed-off-by: Michael Krufky <mkrufky@m1k.net>
+
 2005-10-19 00:20  mkrufky
 
 	* ../v4l/Makefile:
-- 
cgit v1.2.3