summaryrefslogtreecommitdiff
path: root/v4l/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'v4l/ChangeLog')
-rw-r--r--v4l/ChangeLog8
1 files changed, 8 insertions, 0 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 85cbf76be..91af2bc8e 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,11 @@
+2005-10-19 00:44 mkrufky
+
+ * ../v4l/scripts/merge-trees.sh:
+ * ../v4l/scripts/unmerge-trees.sh:
+ - Tree-merge enabled once again.
+
+ Signed-off-by: Michael Krufky <mkrufky@m1k.net>
+
2005-10-19 00:20 mkrufky
* ../v4l/Makefile: