summaryrefslogtreecommitdiff
path: root/v4l/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'v4l/ChangeLog')
-rw-r--r--v4l/ChangeLog11
1 files changed, 10 insertions, 1 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 071d4640d..f86dbd709 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,4 +1,13 @@
-2005-10-08 18:58 mkrufky
+2005-10-08 23:10 mkrufky
+
+ * ../v4l/Makefile:
+ - renamed tree-merge functions. new names:
+ make merge-trees
+ make unmerge-trees
+
+ Signed-off-by: Michael Krufky <mkrufky@m1k.net>
+
+2005-10-08 22:58 mkrufky
* ../linux/include/linux/videodev.h:
- #include "compat.h"