mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-24 17:20:36 +00:00
remove changelog conflict indicators
Original commit message from CVS: remove changelog conflict indicators
This commit is contained in:
parent
4249cf6e1e
commit
2db3e46a44
1 changed files with 0 additions and 2 deletions
|
@ -116,7 +116,6 @@
|
|||
* gst/multifilesink/gstmultifilesink.h:
|
||||
add support for streamheader in multifilesink
|
||||
|
||||
>>>>>>> 1.1087
|
||||
2004-09-22 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
|
||||
|
||||
* gst/asfdemux/gstasfdemux.c: (_read_var_length), (_read_guid),
|
||||
|
@ -1428,7 +1427,6 @@
|
|||
* testsuite/alsa/srcstate.c:
|
||||
add test for alsasrc changing state
|
||||
|
||||
>>>>>>> 1.958
|
||||
2004-07-27 Zaheer Abbas Merali <zaheerabbas at merali dot org>
|
||||
|
||||
* gst/silence/gstsilence.c: (gst_silence_init), (gst_silence_link),
|
||||
|
|
Loading…
Reference in a new issue