mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-06 10:42:22 +00:00
Code Issues 1 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:
remove some deprecated functions
>>>>>>> 1.2127
2005-11-22 Andy Wingo <wingo@pobox.com>
* Update for gst_tag_setter API changes.