mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-05 06:58:56 +00:00
Code Issues 1 Projects Releases Wiki Activity

remove conflict indicators

Browse source 
Original commit message from CVS:
remove conflict indicators
This commit is contained in:
Christian Schaller 2004-03-07 11:26:27 +00:00
parent c0a0422f35
commit 87d5670f80
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

@ -116,7 +116,6 @@
make sure to handle the case where there's no current chain make sure to handle the case where there's no current chain
gracefully. gracefully.
>>>>>>> 1.392
2004-03-05 David Schleef <ds@schleef.org> 2004-03-05 David Schleef <ds@schleef.org>
* ext/aalib/gstaasink.c: (gst_aasink_fixate), (gst_aasink_init): * ext/aalib/gstaasink.c: (gst_aasink_fixate), (gst_aasink_init):