Commit f6e42cd3 authored by David Schleef's avatar David Schleef

ChangeLog: remove conflict markers

Original commit message from CVS:
ChangeLog: remove conflict markers
parent fe67fbb1
2007-12-11 David Schleef <ds@schleef.org>
* ChangeLog: remove conflict markers
2007-12-11 Tim-Philipp Müller <tim at centricular dot net>
* ext/gnomevfs/Makefile.am:
......@@ -146,7 +150,6 @@
(proxy_drained_signal):
Add some more debug info and use factor filtering code.
>>>>>>> 1.3622
2007-11-26 Stefan Kost <ensonic@users.sf.net>
* gst/audiotestsrc/gstaudiotestsrc.c:
......@@ -154,7 +157,6 @@
* gst/volume/gstvolume.h:
Add GAP-flag support.
>>>>>>> 1.3620
2007-11-24 Julien MOUTTE <julien@moutte.net>
* tests/examples/seek/seek.c: (main): Increase the range of the
......@@ -334,7 +336,6 @@
Handle redirect messages by sorting multiple redirections based on the
connection speed.
>>>>>>> 1.3619
2007-11-16 Wim Taymans <wim.taymans@gmail.com>
Patch by: Tommi Myöhänen <ext-tommi dot myohanen at nokia dot com>
......@@ -416,7 +417,6 @@
Instead, pull in glib.h and use g_malloc/g_free for
consistency. Fixes: #496548
>>>>>>> 1.3606
2007-11-09 Stefan Kost <ensonic@users.sf.net>
* gst/playback/gstdecodebin2.c:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment