From e63df8330a4804eb746a91622cfa32ba38947807 Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Fri, 22 Jul 2005 04:09:41 +0000 Subject: * scripts/merge-trees.sh: - New script to symlink DVB frontend code from dvb-kernel cvs tree into patched video4linux cvs tree for testing and development across both trees. * scripts/unmerge-trees.sh: - New script to be run after development, and before generating patches or making cvs commits. This removes the symlinks to the frontend code, and reverts the patch to the video4linux tree created by merge-trees.sh . Signed-off-by: Michael Krufky --- v4l/ChangeLog | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'v4l/ChangeLog') diff --git a/v4l/ChangeLog b/v4l/ChangeLog index f43085148..2abfbd181 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,20 @@ +2005-07-22 03:51 mkrufky + * scripts/merge-trees.sh: + - New script to symlink DVB frontend code from dvb-kernel cvs tree + into patched video4linux cvs tree for testing and development + across both trees. + + * scripts/unmerge-trees.sh: + - New script to be run after development, and before generating + patches or making cvs commits. This removes the symlinks to the + frontend code, and reverts the patch to the video4linux tree + created by merge-trees.sh . + + * saa7134-i2c.c: + - Removed trailing whitespace. + + Signed-off-by: Michael Krufky + 2005-07-22 00:50 mkrufky * Makefile: - Restore EXTRA_CFLAGS for DVB frontends previously removed in error. -- cgit v1.2.3