summaryrefslogtreecommitdiff
path: root/v4l/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'v4l/ChangeLog')
-rw-r--r--v4l/ChangeLog7
1 files changed, 7 insertions, 0 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 2438ce305..20a9b7a93 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,10 @@
+2005-10-01 16:53 mkrufky
+
+ * scripts/merge-trees.sh, scripts/unmerge-trees.sh:
+ - dvb-bt8xx and DST build re-renabled in tree-merge.
+
+ Signed-off-by: Michael Krufky <mkrufky@m1k.net>
+
2005-09-30 15:21 mchehab
* saa7134-cards.c: (saa7134_board_init1):