FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages 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 0bf7a637b1
commit 341e985b1b
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):