mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-23 06:26:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

Erase old CVS conflict line.

Browse source 
Original commit message from CVS:
Erase old CVS conflict line.
This commit is contained in:
Martin Soto 2005-11-24 13:58:55 +00:00
parent f51be26aa8
commit 491c9ab3e0
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

@ -96,7 +96,6 @@
* ext/mad/Makefile.am: * ext/mad/Makefile.am:
libgsttagedit => libgsttag libgsttagedit => libgsttag
>>>>>>> 1.1895
2005-11-22 Edward Hervey <edward@fluendo.com> 2005-11-22 Edward Hervey <edward@fluendo.com>
* ext/lame/gstlame.c: (gst_lame_sink_event): * ext/lame/gstlame.c: (gst_lame_sink_event):