[gst-cvs] thaytan gst-plugins-good: gst-plugins-good/

[thaytan at kemper.freedesktop.org]

CVS Root:       /cvs/gstreamer
Module:         gst-plugins-good
Changes by:     thaytan
Date:           Wed Dec 31 2008  11:21:11 UTC

Log message:
	* ChangeLog:
	Remove conflict marker from ChangeLog

Modified files:
    .               : ChangeLog

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/ChangeLog.diff?r1=1.3875&r2=1.3876