diff options
| author | David Schleef <ds@schleef.org> | 2007-12-11 21:18:57 +0000 |
|---|---|---|
| committer | David Schleef <ds@schleef.org> | 2007-12-11 21:18:57 +0000 |
| commit | f6e42cd3d5cb1869f4c3b1a40cccea1d1621e760 (patch) | |
| tree | d51c5fe6d1037ed74911bc3a6b52b1f23469e273 | |
| parent | fe67fbb1ffc8e628f348b8f4a05d3e9bd51b6b35 (diff) | |
ChangeLog: remove conflict markers
Original commit message from CVS:
ChangeLog: remove conflict markers
| -rw-r--r-- | ChangeLog | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -1,3 +1,7 @@ +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: |