projects
/
platform
/
upstream
/
gstreamer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2c7c000
)
cvs commit: warning: file 'ChangeLog' seems to still contain conflict indicators
author
Benjamin Otte
<otte@gnome.org>
Fri, 7 May 2004 00:45:12 +0000
(
00:45
+0000)
committer
Benjamin Otte
<otte@gnome.org>
Fri, 7 May 2004 00:45:12 +0000
(
00:45
+0000)
Original commit message from CVS:
cvs commit: warning: file 'ChangeLog' seems to still contain conflict indicators
ChangeLog
patch
|
blob
|
history
diff --git
a/ChangeLog
b/ChangeLog
index
465227e
..
ce50411
100644
(file)
--- 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),