[gst-cvs] thomasvs gstreamer: gstreamer/ gstreamer/docs/gst/tmpl/

[Thomas Vander Stichele]

CVS Root:       /home/cvs/gstreamer
Module:         gstreamer
Changes by:     thomasvs
Date:           Thu Dec 25 2003  01:36:12 PST

Log message:
removing conflict traces

Modified files:
    .               : ChangeLog
    docs/gst/tmpl   : gstreamer-unused.sgml

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.53&r2=1.54
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/docs/gst/tmpl/gstreamer-unused.sgml.diff?r1=1.78&r2=1.79