diff options
Diffstat (limited to 'v4l/ChangeLog')
| -rw-r--r-- | v4l/ChangeLog | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog index e29ca7f7a..9f7322697 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,12 @@ +2005-10-18 23:42 mkrufky + + * ../v4l/Makefile: + * ../v4l/scripts/merge-trees.sh: + * ../v4l/scripts/unmerge-trees.sh: + - Previous commit broke tree-merge. Here is the correct fix. + + Signed-off-by: Michael Krufky <mkrufky@m1k.net> + 2005-10-18 21:59 mkrufky * ../v4l/Makefile: |