summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Otte <otte@gnome.org>2004-05-07 00:45:12 +0000
committerBenjamin Otte <otte@gnome.org>2004-05-07 00:45:12 +0000
commit0d67d991519878334dc442b909f70bceb7f52812 (patch)
treec7033346064bf150e8ceb2553ee72a9ed681997e
parent2c7c000f20becd1d6789f41d856816365cfbcf31 (diff)
downloadgst-plugins-bad-0d67d991519878334dc442b909f70bceb7f52812.tar.gz
gst-plugins-bad-0d67d991519878334dc442b909f70bceb7f52812.tar.bz2
gst-plugins-bad-0d67d991519878334dc442b909f70bceb7f52812.zip
cvs commit: warning: file 'ChangeLog' seems to still contain conflict indicators
Original commit message from CVS: cvs commit: warning: file 'ChangeLog' seems to still contain conflict indicators
-rw-r--r--ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 465227e8..ce50411b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -111,7 +111,6 @@
* ext/lame/gstlame.c:
correct defaults that lame_init puts out of range
->>>>>>> 1.601
2004-05-03 Thomas Vander Stichele <thomas at apestaart dot org>
* ext/divx/gstdivxenc.c: (gst_divxenc_get_type),