summaryrefslogtreecommitdiff
path: root/v4l/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'v4l/scripts')
-rw-r--r--v4l/scripts/merge-trees.sh2
1 files changed, 1 insertions, 1 deletions
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