diff options
| author | Michael Krufky <devnull@localhost> | 2005-10-19 00:45:47 +0000 |
|---|---|---|
| committer | Michael Krufky <devnull@localhost> | 2005-10-19 00:45:47 +0000 |
| commit | 9c60e04085bbfe5cf2eb699d0e070efbf1171389 (patch) | |
| tree | e422a23972dc84b0bc79874d190417714e9275e6 /v4l/ChangeLog | |
| parent | daeb177682b382a9f5b09fb619a46f0aaee23270 (diff) | |
| download | mediapointer-dvb-s2-9c60e04085bbfe5cf2eb699d0e070efbf1171389.tar.gz mediapointer-dvb-s2-9c60e04085bbfe5cf2eb699d0e070efbf1171389.tar.bz2 | |
- Tree-merge enabled once again.
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Diffstat (limited to 'v4l/ChangeLog')
| -rw-r--r-- | v4l/ChangeLog | 8 |
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: |