diff options
| author | Michael Krufky <devnull@localhost> | 2005-10-18 23:43:59 +0000 |
|---|---|---|
| committer | Michael Krufky <devnull@localhost> | 2005-10-18 23:43:59 +0000 |
| commit | a9fd11446840e22affd801cb50477ed11ad4b64c (patch) | |
| tree | 7c6babe9f8c10f9927bb4e668e72754956acd059 /v4l/ChangeLog | |
| parent | f9d8e262ca6715281768204ba609ab6983343b46 (diff) | |
| download | mediapointer-dvb-s2-a9fd11446840e22affd801cb50477ed11ad4b64c.tar.gz mediapointer-dvb-s2-a9fd11446840e22affd801cb50477ed11ad4b64c.tar.bz2 | |
- Previous commit broke tree-merge. Here is the correct fix.
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
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: |