mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-23 07:38:16 +00:00
Code Issues 1 Projects Releases Wiki Activity

Remove spurious conflict marker

Browse source 
Original commit message from CVS:

Remove spurious conflict marker
This commit is contained in:
Jan Schmidt 2007-03-02 13:33:39 +00:00
parent 6ffee3230a
commit 5e1e68c068
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ChangeLog
View file

@ -63,7 +63,6 @@
Add a new plugin/library to make it easy for apps to shove Add a new plugin/library to make it easy for apps to shove
data into a pipeline. data into a pipeline.
>>>>>>> 1.2426
2007-02-26 Tim-Philipp Müller <tim at centricular dot net> 2007-02-26 Tim-Philipp Müller <tim at centricular dot net>
* gst/real/gstrealaudiodec.c: (gst_real_audio_dec_init): * gst/real/gstrealaudiodec.c: (gst_real_audio_dec_init):