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

remove conflict line in changelog

Browse source 
Original commit message from CVS:
remove conflict line in changelog
This commit is contained in:
Thomas Vander Stichele 2004-03-08 09:20:31 +00:00
parent 9b3eb417bd
commit cd56f878ff
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

@ -292,7 +292,6 @@
* docs/manual/debugging.xml: * docs/manual/debugging.xml:
fix manual for new debugging system fix manual for new debugging system
>>>>>>> 1.292
2004-02-25 Andy Wingo <wingo@pobox.com> 2004-02-25 Andy Wingo <wingo@pobox.com>
* gst/gstpad.c (gst_pad_link_prepare): Re-add * gst/gstpad.c (gst_pad_link_prepare): Re-add