thaytan gst-plugins-good: gst-plugins-good/

[email protected] Wed, 31 Dec 2008 03:21:11 -0800 (PST)

Newsgroups	gmane.comp.video.gstreamer.cvs
Message-ID	<[email protected]>

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

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-good/ChangeLog,v
retrieving revision 1.3875
retrieving revision 1.3876
diff -u -d -r1.3875 -r1.3876
--- ChangeLog	28 Dec 2008 09:50:29 -0000	1.3875
+++ ChangeLog	31 Dec 2008 11:20:55 -0000	1.3876
@@ -1,3 +1,8 @@
+2008-12-31  Jan Schmidt  <[email protected]>
+
+	* ChangeLog:
+	Remove conflict marker from ChangeLog
 2008-12-28  Edward Hervey  <[email protected]>
 
 	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  <[email protected]>
 	* docs/plugins/Makefile.am:

------------------------------------------------------------------------------

_______________________________________________
gstreamer-cvs-verbose mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gstreamer-cvs-verbose