diff options
| author | Benjamin Otte <otte@gnome.org> | 2004-05-07 00:45:12 +0000 |
|---|---|---|
| committer | Benjamin Otte <otte@gnome.org> | 2004-05-07 00:45:12 +0000 |
| commit | ed474907d4715d6c00cee20d52b9133474de4113 (patch) | |
| tree | 59cf98a8206e68a2d7a2f07e7016d19e292c340d /ChangeLog | |
| parent | 952bf6bf5a161051580c0fbaaf53dfb5d77a4402 (diff) | |
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
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -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), |