From 3f17137c9765d6f74ef12b82a97fa8c2d8cbb4e2 Mon Sep 17 00:00:00 2001
From: Michael Krufky <devnull@localhost>
Date: Fri, 30 Sep 2005 03:32:57 +0000
Subject: correct typo

---
 v4l/scripts/merge-trees.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'v4l/scripts')

diff --git a/v4l/scripts/merge-trees.sh b/v4l/scripts/merge-trees.sh
index 0d18ed125..34b803e1b 100644
--- a/v4l/scripts/merge-trees.sh
+++ b/v4l/scripts/merge-trees.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 echo V4L: WARNING!  bt8xx tree-merge is currently broken. dvb/bt8xx build
-echo disabled. To force dvb-bt8xx, bt878 & dst build, edit Make.config
+echo disabled. To force dvb-bt8xx, bt878 and dst build, edit Make.config
 echo If you need this feature to work, please use an older video4linux cvs:
 echo .
 echo cvs co -D 9/29/05 video4linux
-- 
cgit v1.2.3