mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-19 14:56:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

ChangeLog: remove conflict markers

Browse source 
Original commit message from CVS:
ChangeLog: remove conflict markers
This commit is contained in:
David Schleef 2007-12-11 21:18:57 +00:00
parent fe67fbb1ff
commit f6e42cd3d5
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -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> 2007-12-11 Tim-Philipp Müller <tim at centricular dot net>
* ext/gnomevfs/Makefile.am: * ext/gnomevfs/Makefile.am:
@ -146,7 +150,6 @@
(proxy_drained_signal): (proxy_drained_signal):
Add some more debug info and use factor filtering code. Add some more debug info and use factor filtering code.
>>>>>>> 1.3622
2007-11-26 Stefan Kost <ensonic@users.sf.net> 2007-11-26 Stefan Kost <ensonic@users.sf.net>
* gst/audiotestsrc/gstaudiotestsrc.c: * gst/audiotestsrc/gstaudiotestsrc.c:
@ -154,7 +157,6 @@
* gst/volume/gstvolume.h: * gst/volume/gstvolume.h:
Add GAP-flag support. Add GAP-flag support.
>>>>>>> 1.3620
2007-11-24 Julien MOUTTE <julien@moutte.net> 2007-11-24 Julien MOUTTE <julien@moutte.net>
* tests/examples/seek/seek.c: (main): Increase the range of the * 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 Handle redirect messages by sorting multiple redirections based on the
connection speed. connection speed.
>>>>>>> 1.3619
2007-11-16 Wim Taymans <wim.taymans@gmail.com> 2007-11-16 Wim Taymans <wim.taymans@gmail.com>
Patch by: Tommi Myöhänen <ext-tommi dot myohanen at nokia dot 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 Instead, pull in glib.h and use g_malloc/g_free for
consistency. Fixes: #496548 consistency. Fixes: #496548
>>>>>>> 1.3606
2007-11-09 Stefan Kost <ensonic@users.sf.net> 2007-11-09 Stefan Kost <ensonic@users.sf.net>
* gst/playback/gstdecodebin2.c: * gst/playback/gstdecodebin2.c: