[gst-devel] Re: [gst-cvs] company gstreamer: gstreamer/ gstreamer/gst/

[Ronald S. Bultje]

Hi,

On Mon, 2004-10-11 at 07:23, Benjamin Otte wrote:
> --- ChangeLog	9 Oct 2004 13:11:46 -0000	1.808
> +++ ChangeLog	11 Oct 2004 05:23:40 -0000	1.809
[..]
> @@ -197,6 +204,7 @@
>  	* gst/elements/gstidentity.h:
>  	Added datarate properties to limit the datarate.
> +>>>>>>> 1.808
>  2004-08-25  Benjamin Otte  <in7y118 at public.uni-hamburg.de>
>  	* gst/autoplug/gstspider.c: (plugin_init):

Can you remove that? :).

Ronald

-- 
Ronald S. Bultje <rbultje at ronald.bitfreak.net>