mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-27 18:50:48 +00:00
Code Issues 1 Projects Releases Wiki Activity

whoops, de-conflictify

Browse source 
Original commit message from CVS:
whoops, de-conflictify
This commit is contained in:
Andy Wingo 2004-02-11 13:28:59 +00:00
parent d0c8e3a921
commit e7995531e7
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

@ -220,7 +220,6 @@
revert patch that breaks applications, reapply after release
to get this fixed properly
>>>>>>> 1.222
2004-02-05 Benjamin Otte <in7y118@public.uni-hamburg.de>
* gst/gsttag.c: (_gst_tag_initialize):