summaryrefslogtreecommitdiff
path: root/v4l/scripts
diff options
context:
space:
mode:
authorMichael Krufky <devnull@localhost>2005-09-30 03:32:57 +0000
committerMichael Krufky <devnull@localhost>2005-09-30 03:32:57 +0000
commit3f17137c9765d6f74ef12b82a97fa8c2d8cbb4e2 (patch)
treeebecb4763cee0abd1d789c98b0011c9e38d578a8 /v4l/scripts
parent651ba1b6af12c33b2d37e29ad2c5b0f9fa2d6384 (diff)
downloadmediapointer-dvb-s2-3f17137c9765d6f74ef12b82a97fa8c2d8cbb4e2.tar.gz
mediapointer-dvb-s2-3f17137c9765d6f74ef12b82a97fa8c2d8cbb4e2.tar.bz2
correct typo
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