diff options
Diffstat (limited to 'v4l/ChangeLog')
| -rw-r--r-- | v4l/ChangeLog | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog index ac6105dd2..071d4640d 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,21 @@ +2005-10-08 18:58 mkrufky + + * ../linux/include/linux/videodev.h: + - #include "compat.h" + + * ../v4l/Makefile: + - add two new make commands for tree-merge: + make merge + make unmerge + - this allows tree-merge commands to be called from + both top-level v4l-kernel and v4l-kernel/v4l + + * ../v4l/scripts/merge-trees.sh: + * ../v4l/scripts/unmerge-trees.sh: + - fix offsets + + Signed-off-by: Michael Krufky <mkrufky@m1k.net> + 2005-10-08 21:54 mkrufky * ../v4l/Makefile: |