mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 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 952bf6bf5a
commit ed474907d4
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),