FaSTTUBe/GST-Tensordecoder-ov_ep
61
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cvs commit: warning: file 'ChangeLog' seems to still contain conflict indicators

Browse Source 
Original commit message from CVS:
cvs commit: warning: file 'ChangeLog' seems to still contain conflict indicators
This commit is contained in:
Benjamin Otte 2004-05-07 00:45:12 +00:00
parent c1ff34505b
commit b1baf7d484
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

@ -111,7 +111,6 @@
* ext/lame/gstlame.c: * ext/lame/gstlame.c:
correct defaults that lame_init puts out of range correct defaults that lame_init puts out of range
>>>>>>> 1.601
2004-05-03 Thomas Vander Stichele <thomas at apestaart dot org> 2004-05-03 Thomas Vander Stichele <thomas at apestaart dot org>
* ext/divx/gstdivxenc.c: (gst_divxenc_get_type), * ext/divx/gstdivxenc.c: (gst_divxenc_get_type),