mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-21 21:46:22 +00:00
Code Issues 1 Projects Releases Wiki Activity

ChangeLog: Remove conflict marker from ChangeLog

Browse source 
Original commit message from CVS:
* ChangeLog:
Remove conflict marker from ChangeLog
This commit is contained in:
Jan Schmidt 2008-12-31 11:20:55 +00:00
parent dc4240de34
commit f2c94d1468
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -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> 2008-12-28 Edward Hervey <edward.hervey@collabora.co.uk>
Patch by: j^ <j at oil21.org> Patch by: j^ <j at oil21.org>
@ -210,7 +215,6 @@
Make usage of libv4l optional by a configure parameter. Make usage of libv4l optional by a configure parameter.
Fixes bug #563504. Fixes bug #563504.
>>>>>>> 1.3872
2008-12-05 Sebastian Dröge <sebastian.droege@collabora.co.uk> 2008-12-05 Sebastian Dröge <sebastian.droege@collabora.co.uk>
* docs/plugins/Makefile.am: * docs/plugins/Makefile.am: