FaSTTUBe/GST-Tensordecoder-ov_ep
61
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Remove conflict marker

Browse Source 
Original commit message from CVS:
Remove conflict marker
This commit is contained in:
Michael Smith 2005-11-22 16:33:29 +00:00
parent 4feeea6c13
commit e558623852
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

@ -51,7 +51,6 @@
* gst-libs/gst/audio/audio.h: * gst-libs/gst/audio/audio.h:
remove some deprecated functions remove some deprecated functions
>>>>>>> 1.2127
2005-11-22 Andy Wingo <wingo@pobox.com> 2005-11-22 Andy Wingo <wingo@pobox.com>
* Update for gst_tag_setter API changes. * Update for gst_tag_setter API changes.