FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages 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):