diff options
| author | Jan Schmidt <thaytan@mad.scientist.com> | 2008-12-31 11:20:55 +0000 |
|---|---|---|
| committer | Jan Schmidt <thaytan@mad.scientist.com> | 2008-12-31 11:20:55 +0000 |
| commit | f2c94d14683658514c236b38e9ed7ef557b7145f (patch) | |
| tree | fe402ebcc2f480e61316ba4980395b3da7eb98c7 /ChangeLog | |
| parent | dc4240de34ada0476a2e456f35ba70a910cc84af (diff) | |
ChangeLog: Remove conflict marker from ChangeLog
Original commit message from CVS:
* ChangeLog:
Remove conflict marker from ChangeLog
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -1,3 +1,8 @@ +2008-12-31 Jan Schmidt <jan.schmidt@sun.com> + + * ChangeLog: + Remove conflict marker from ChangeLog + 2008-12-28 Edward Hervey <edward.hervey@collabora.co.uk> Patch by: j^ <j at oil21.org> @@ -210,7 +215,6 @@ Make usage of libv4l optional by a configure parameter. Fixes bug #563504. ->>>>>>> 1.3872 2008-12-05 Sebastian Dröge <sebastian.droege@collabora.co.uk> * docs/plugins/Makefile.am: |