mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 04:01:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

Fix conflict marker

Browse source 
Original commit message from CVS:
Fix conflict marker
This commit is contained in:
Jan Schmidt 2005-11-29 15:15:38 +00:00
parent aff648ab66
commit 4c43a3273d
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

@ -29,7 +29,6 @@
* gst/gstghostpad.c: (gst_proxy_pad_get_target):
Don't ref NULL target pad (#322751). Improve docs.
>>>>>>> 1.2041
2005-11-29 Michael Smith <msmith@fluendo.com>
* gst/gstregistryxml.c: (load_plugin):