mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 20:21:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

remove changelog conflict indicators

Browse source 
Original commit message from CVS:
remove changelog conflict indicators
This commit is contained in:
Christian Schaller 2004-09-25 14:54:01 +00:00
parent 037cc62fc6
commit aedb2eb2bc
1 changed files with 0 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -116,7 +116,6 @@
* gst/multifilesink/gstmultifilesink.h: * gst/multifilesink/gstmultifilesink.h:
add support for streamheader in multifilesink add support for streamheader in multifilesink
>>>>>>> 1.1087
2004-09-22 Ronald S. Bultje <rbultje@ronald.bitfreak.net> 2004-09-22 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* gst/asfdemux/gstasfdemux.c: (_read_var_length), (_read_guid), * gst/asfdemux/gstasfdemux.c: (_read_var_length), (_read_guid),
@ -1428,7 +1427,6 @@
* testsuite/alsa/srcstate.c: * testsuite/alsa/srcstate.c:
add test for alsasrc changing state add test for alsasrc changing state
>>>>>>> 1.958
2004-07-27 Zaheer Abbas Merali <zaheerabbas at merali dot org> 2004-07-27 Zaheer Abbas Merali <zaheerabbas at merali dot org>
* gst/silence/gstsilence.c: (gst_silence_init), (gst_silence_link), * gst/silence/gstsilence.c: (gst_silence_init), (gst_silence_link),