Commit graph

2073 commits

Author SHA1 Message Date
Stéphane Loeuillet
a894223464 gst-libs/gst/riff/riff-read.c: - fix INFO tag extraction in RIFF/AVI files because gst_event_unref (event) also freed...
Original commit message from CVS:
* gst-libs/gst/riff/riff-read.c :
- fix INFO tag extraction in RIFF/AVI files
because gst_event_unref (event) also freed taglist
- avoid a mem leak
2004-05-14 17:23:08 +00:00
Stéphane Loeuillet
8913233da2 - typos : unkown => unknown
Original commit message from CVS:
- typos : unkown => unknown
- missing break in RIFF/AVI iavs caps creation (was triggering a gsttag.c assert
2004-05-14 11:39:41 +00:00
Stéphane Loeuillet
6fb8dff08d ext/audiofile/gstafparse.c: change class to Codec/Demuxer/Audio
Original commit message from CVS:
* ext/audiofile/gstafparse.c : change class to Codec/Demuxer/Audio
* gst/auparse/gstauparse.c : idem
* gst/wavparse/gstwavparse.c : idem
2004-05-13 21:42:13 +00:00
Stéphane Loeuillet
7710c86dc7 ext/mad/gstid3tag.c: move from "Codec/(Dem/M)uxer" to "Codec/(Dem/M)uxer/Audio"
Original commit message from CVS:
* ext/mad/gstid3tag.c : move from "Codec/(Dem/M)uxer" to "Codec/(Dem/M)uxer/Audio"
* gst/wavenc/gstwavenc.c : move from "Codec/Encoder/Audio" to "Codec/Muxer/Audio"

* gst/auparse/gstauparse.c :
- add code (commented for now) to support audio/x-adpcm on src pad
(we have no decoder for those layout yet)

* gst/cdxaparse/gstcdxaparse.c :
* gst/cdxaparse/gstcdxaparse.h :
- partial rewrite using RiffRead (ripped iain's wavparse code)

* gst/rtp/gstrtpL16enc.c : typo
* gst/rtp/gstrtpgsmenc.c : typo
2004-05-13 21:27:14 +00:00
Benjamin Otte
9a1f739d23 configure.ac: check for exact version of libvisual, it's not supposed to be
Original commit message from CVS:
* configure.ac:
check for exact version of libvisual, it's not supposed to be
API/ABI stable yet
2004-05-13 20:21:39 +00:00
Benjamin Otte
d3ffec4b9c ext/ogg/gstoggdemux.c: signal no-more-pads
Original commit message from CVS:
* ext/ogg/gstoggdemux.c: (gst_ogg_demux_push):
signal no-more-pads
2004-05-13 16:07:16 +00:00
Jan Schmidt
485f32c005 Report which format was used for GST_FORMAT_DEFAULT in dvdec
Original commit message from CVS:
Report which format was used for GST_FORMAT_DEFAULT in dvdec
Add progressreport element for testing.
2004-05-13 11:32:42 +00:00
Stéphane Loeuillet
98ab8bfd8f gst-libs/gst/riff/riff-ids.h: - add CDXA to the list of RIFF types
Original commit message from CVS:
* gst-libs/gst/riff/riff-ids.h :
- add CDXA to the list of RIFF types
- add plst (playlist ?) to wav chunk list (only diff with wavparse/riff.h)
2004-05-13 11:32:38 +00:00
Thomas Vander Stichele
ee1325274f sys/v4l/: add more debugging send a discont at start
Original commit message from CVS:
* sys/v4l/gstv4lsrc.c: (gst_v4lsrc_get), (gst_v4lsrc_change_state):
* sys/v4l/gstv4lsrc.h:
* sys/v4l/v4lmjpegsink_calls.c: (gst_v4lmjpegsink_playback_init):
* sys/v4l/v4lmjpegsrc_calls.c: (gst_v4lmjpegsrc_capture_init):
* sys/v4l/v4lsrc_calls.c: (gst_v4lsrc_capture_init),
(gst_v4lsrc_grab_frame):
add more debugging
send a discont at start
2004-05-13 10:13:41 +00:00
Colin Walters
d62dc0ad97 Avoid inflooping
Original commit message from CVS:
Avoid inflooping
2004-05-13 00:59:19 +00:00
Jan Schmidt
3b47dd30d6 ext/audiofile/gstafsrc.c: Remove old debug output
Original commit message from CVS:
* ext/audiofile/gstafsrc.c: (gst_afsrc_get):
Remove old debug output
* ext/dv/gstdvdec.c: (gst_dvdec_quality_get_type),
(gst_dvdec_class_init), (gst_dvdec_loop), (gst_dvdec_change_state),
(gst_dvdec_set_property), (gst_dvdec_get_property):
Change the quality setting to an enum, so it works from gst-launch
Don't renegotiate a non-linked pad. Allows audio only decoding.
* gst/deinterlace/gstdeinterlace.c: (gst_deinterlace_getcaps),
(gst_deinterlace_link), (gst_deinterlace_init):
* gst/videodrop/gstvideodrop.c: (gst_videodrop_getcaps),
(gst_videodrop_link):
Some caps negotiation fixes
2004-05-12 14:53:58 +00:00
Stéphane Loeuillet
cbc28f86f9 ext/tarkin/gsttarkin.c: - Change RANK from NONE to PRIMARY (decoder)
Original commit message from CVS:
* ext/tarkin/gsttarkin.c :
- Change RANK from NONE to PRIMARY (decoder)
* ext/gdk_pixbuf/gstgdkpixbuf.c :
- Change RANK from NONE to MARGINAL (decoder)
* ext/divx/gstdivxenc.c :
- Change RANK from PRIMARY to NONE (encoder/spider issue)
2004-05-12 10:19:19 +00:00
Thomas Vander Stichele
08e51cbecf copy this function until we really need > 1.0 of vorbis
Original commit message from CVS:
copy this function until we really need > 1.0 of vorbis
2004-05-12 07:18:02 +00:00
Benjamin Otte
956bbbbf23 configure.ac: enable shout2 by default
Original commit message from CVS:
* configure.ac:
enable shout2 by default
* ext/shout2/gstshout2.c: (gst_shout2send_protocol_get_type),
(gst_shout2send_base_init), (gst_shout2send_init),
(gst_shout2send_connect), (gst_shout2send_change_state):
* ext/shout2/gstshout2.h:
make this work again. Based on a patch by Zaheer Merali (fixes
#142262)
* ext/theora/theora.c: (plugin_init):
don't set rank on encoders
2004-05-12 02:35:56 +00:00
Stéphane Loeuillet
ec58fae8dd gst/auparse/gstauparse.c: - Document all audio encoding we can encounter from Solaris 9 headers and libsndfile inform...
Original commit message from CVS:
* gst/auparse/gstauparse.c :
- Document all audio encoding we can encounter from Solaris 9
headers and libsndfile information.
- Increase max. rate from 48000 to 192000 (to match other elements)
- Don't try to play junk data between header and samples
2004-05-11 22:55:35 +00:00
Stéphane Loeuillet
1bdc31fc05 gst/cdxaparse/gstcdxaparse.c: Add mpegversion to CAPS to make it link
Original commit message from CVS:
* gst/cdxaparse/gstcdxaparse.c :
Add mpegversion to CAPS to make it link
Rank is as GST_RANK_SECONDARY instead of NONE
2004-05-11 16:59:44 +00:00
Jeremy Simon
a2fe9a31ac gst/asfdemux/gstasfdemux.c: Use codec_data property instead of flag1 and flag2 for wma
Original commit message from CVS:
* gst/asfdemux/gstasfdemux.c: (gst_asf_demux_audio_caps):
Use codec_data property instead of flag1 and flag2 for wma
2004-05-11 16:25:03 +00:00
Benjamin Otte
eb67de5ac7 ext/libvisual/visual.c: use the right caps depending on endianness (I hope)
Original commit message from CVS:
* ext/libvisual/visual.c: (gst_visual_getcaps):
use the right caps depending on endianness (I hope)
* ext/ogg/gstoggmux.c: (gst_ogg_mux_plugin_init):
use GST_RANK_NONE for all non-decoding elements or spider gets
mighty confused
2004-05-11 15:31:35 +00:00
Ronald S. Bultje
d2614fde29 gst/asfdemux/gstasfdemux.c: Fix some odd cases and fix BE metadata parsing of unicode16 text.
Original commit message from CVS:
* gst/asfdemux/gstasfdemux.c: (gst_asf_demux_process_comment):
Fix some odd cases and fix BE metadata parsing of unicode16 text.
2004-05-11 04:33:48 +00:00
Benjamin Otte
97a4cb6bb8 gst/switch/gstswitch.c: whoever that was: DO NOT IMPORT PRIVATE SYMBOLS THAT ARE NOT IN
Original commit message from CVS:
* gst/switch/gstswitch.c: (gst_switch_release_pad),
(gst_switch_request_new_pad), (gst_switch_poll_sinkpads),
(gst_switch_loop), (gst_switch_get_type):
whoever that was: DO NOT IMPORT PRIVATE SYMBOLS THAT ARE NOT IN
HEADERS. Had to be said.
2004-05-11 03:56:20 +00:00
David Schleef
08499d6af3 configure.ac: Add prototype Dirac support.
Original commit message from CVS:
* configure.ac: Add prototype Dirac support.
* ext/Makefile.am:
* ext/dirac/Makefile.am:
* ext/dirac/gstdirac.cc:
* ext/dirac/gstdiracdec.cc:
2004-05-11 02:30:16 +00:00
Ronald S. Bultje
ac2b21a7c6 gst/auparse/gstauparse.c: Hack around spider. Remove me some day please.
Original commit message from CVS:
* gst/auparse/gstauparse.c: (gst_auparse_class_init),
(gst_auparse_init), (gst_auparse_chain),
(gst_auparse_change_state):
Hack around spider. Remove me some day please.
2004-05-11 00:20:02 +00:00
Ronald S. Bultje
d2b12c636d gst/auparse/gstauparse.c: Fix for some uninitialized variables in previous patch, also makes it work. Fixes #142286 w...
Original commit message from CVS:
* gst/auparse/gstauparse.c: (gst_auparse_chain):
Fix for some uninitialized variables in previous patch, also
makes it work. Fixes #142286 while we're at it.
2004-05-11 00:07:57 +00:00
Stéphane Loeuillet
a580c78ec3 gst/auparse/gstauparse.c: eee (32, 64) only unsupported formats are ADPCM/CCITT G.72x
Original commit message from CVS:
* gst/auparse/gstauparse.c:
fixes a-law, adds mu-law, linear pcm (8,16,24,32), ieee (32, 64)
only unsupported formats are ADPCM/CCITT G.72x
reviewed by Ronald
* gst-libs/gst/audio/audio.h:
adds 24bit depth to PCM (x-raw-int)
2004-05-10 23:55:17 +00:00
Wim Taymans
481d7b7202 ext/vorbis/: Added a raw vorbis encoder to be used with the oggmuxer.
Original commit message from CVS:
* ext/vorbis/Makefile.am:
* ext/vorbis/README:
* ext/vorbis/oggvorbisenc.c: (gst_oggvorbisenc_get_formats),
(oggvorbisenc_get_type), (vorbis_caps_factory), (raw_caps_factory),
(gst_oggvorbisenc_base_init), (gst_oggvorbisenc_class_init),
(gst_oggvorbisenc_sinkconnect), (gst_oggvorbisenc_convert_src),
(gst_oggvorbisenc_convert_sink),
(gst_oggvorbisenc_get_query_types), (gst_oggvorbisenc_src_query),
(gst_oggvorbisenc_init), (gst_oggvorbisenc_get_tag_value),
(gst_oggvorbisenc_metadata_set1), (gst_oggvorbisenc_set_metadata),
(get_constraints_string), (update_start_message),
(gst_oggvorbisenc_setup), (gst_oggvorbisenc_write_page),
(gst_oggvorbisenc_chain), (gst_oggvorbisenc_get_property),
(gst_oggvorbisenc_set_property), (gst_oggvorbisenc_change_state):
* ext/vorbis/oggvorbisenc.h:
* ext/vorbis/vorbis.c: (plugin_init):
* ext/vorbis/vorbisenc.c: (vorbis_caps_factory),
(raw_caps_factory), (gst_vorbisenc_class_init),
(gst_vorbisenc_init), (gst_vorbisenc_setup),
(gst_vorbisenc_push_packet), (gst_vorbisenc_chain),
(gst_vorbisenc_get_property), (gst_vorbisenc_set_property):
* ext/vorbis/vorbisenc.h:
Added a raw vorbis encoder to be used with the oggmuxer.
We still need the old encoder for some gnome applications,
read the README to find out how that works.
The raw encoder is called "rawvorbisenc" until 0.9.
2004-05-10 17:44:06 +00:00
Stéphane Loeuillet
3d20ac68ac someone ported wavparse to riff-lib, remove it from TODO
Original commit message from CVS:
someone ported wavparse to riff-lib, remove it from TODO
2004-05-10 15:02:01 +00:00
Wim Taymans
f28e95906d ext/ogg/: Added an ogg muxer.
Original commit message from CVS:
* ext/ogg/gstogg.c: (plugin_init):
* ext/ogg/gstoggdemux.c: (gst_ogg_demux_plugin_init),
(gst_ogg_print):
* ext/ogg/gstoggmux.c: (gst_ogg_mux_get_type),
(gst_ogg_mux_base_init), (gst_ogg_mux_class_init),
(gst_ogg_mux_get_sink_event_masks), (gst_ogg_mux_init),
(gst_ogg_mux_sinkconnect), (gst_ogg_mux_pad_link),
(gst_ogg_mux_pad_unlink), (gst_ogg_mux_request_new_pad),
(gst_ogg_mux_handle_src_event), (gst_ogg_mux_next_buffer),
(gst_ogg_mux_push_page), (gst_ogg_mux_compare_pads),
(gst_ogg_mux_queue_pads), (gst_ogg_mux_loop),
(gst_ogg_mux_get_property), (gst_ogg_mux_set_property),
(gst_ogg_mux_change_state), (gst_ogg_mux_plugin_init):
Added an ogg muxer.
Small typo fixes in the demuxer.
2004-05-10 13:34:56 +00:00
Wim Taymans
3fc3170249 ext/theora/theoraenc.c: Mark the last packet with an EOS flag which is not really needed in gstreamer.
Original commit message from CVS:
* ext/theora/theoraenc.c: (gst_theora_enc_class_init),
(theora_enc_sink_link), (theora_push_packet), (theora_enc_chain),
(theora_enc_change_state), (theora_enc_set_property),
(theora_enc_get_property):
Mark the last packet with an EOS flag which is not really needed
in gstreamer.
Do some better video framerate initialisation.
Update the buffer timestamp.
2004-05-10 13:32:11 +00:00
Stéphane Loeuillet
e3da9b7ea8 ext/tarkin/gsttarkindec.c: "Filter/Video/Decoder" => "Codec/Decoder/Video"
Original commit message from CVS:
* ext/tarkin/gsttarkindec.c : "Filter/Video/Decoder" => "Codec/Decoder/Video"
* ext/tarkin/gsttarkinenc.c : "Filter/Video/Encoder" => "Codec/Encoder/Video"
2004-05-10 12:33:23 +00:00
Stéphane Loeuillet
e8ed2bdec8 ext/theora/theoradec.c: "Filter/Decoder/Video" => "Codec/Decoder/Video"
Original commit message from CVS:
* ext/theora/theoradec.c : "Filter/Decoder/Video" => "Codec/Decoder/Video"
* ext/theora/theoraenc.c : "Filter/Encoder/Video" => "Codec/Encoder/Video"
* ext/xine/xineaudiodec.c : "Filter/Decoder/Audio" =>"Codec/Decoder/Audio"
2004-05-10 12:22:05 +00:00
Jan Schmidt
356600bfa0 Return the result of the parent state change call
Original commit message from CVS:
Return the result of the parent state change call
2004-05-10 12:19:02 +00:00
Stéphane Loeuillet
0dbe298e53 ext/a52dec/gsta52dec.c: mark audio/a52, audio/ac3 as deprecated in a comment
Original commit message from CVS:
* ext/a52dec/gsta52dec.c : mark audio/a52, audio/ac3 as deprecated in a comment
* gst/ac3parse/gstac3parse.c : audio/ac3 => audio/x-ac3
* gst/realmedia/rmdemux.c : audio/a52 => audio/x-ac3
2004-05-10 00:27:36 +00:00
Stéphane Loeuillet
3044ad4c33 gst/law/alaw-decode.c: put audio/x-alaw on pads, instead of audio/x-mulaw
Original commit message from CVS:
* gst/law/alaw-decode.c : put audio/x-alaw on pads, instead of audio/x-mulaw
* gst/law/alaw-encode.c : (idem)
2004-05-09 22:56:56 +00:00
Stéphane Loeuillet
fd567b5810 gst/law/alaw.c: alawdec should be registered with type ALAWDEC, not ALAWENC
Original commit message from CVS:
* gst/law/alaw.c : alawdec should be registered with type ALAWDEC, not ALAWENC
2004-05-09 22:46:06 +00:00
Benjamin Otte
b023a19ca4 ext/alsa/gstalsasrc.c: don't use a fixed buffer size when writing variable length data to it. Fixes memory corruption...
Original commit message from CVS:
* ext/alsa/gstalsasrc.c: (gst_alsa_src_loop):
don't use a fixed buffer size when writing variable length data to
it. Fixes memory corruption and makes alsasrc work
2004-05-09 17:25:15 +00:00
Ronald S. Bultje
aa75db4e4b ext/gnomevfs/gstgnomevfssink.c: Run glib's default signal handler (??) in RUN_CLEANUP rather than
Original commit message from CVS:
* ext/gnomevfs/gstgnomevfssink.c:
(_gst_boolean_allow_overwrite_accumulator),
(gst_gnomevfssink_class_init), (gst_gnomevfssink_open_file):
Run glib's default signal handler (??) in RUN_CLEANUP rather than
RUN_LAST, and don't use that to set the accumulator value because
then it's always FALSE.
2004-05-09 16:48:42 +00:00
Ronald S. Bultje
3ce13c7d99 gst-libs/gst/riff/: Fix for unaligned RIFF files (i.e. where all the chunks together in a LIST chunk are not of the s...
Original commit message from CVS:
* gst-libs/gst/riff/riff-media.c:
(gst_riff_create_video_caps_with_data),
(gst_riff_create_audio_caps),
(gst_riff_create_audio_template_caps):
* gst-libs/gst/riff/riff-read.c: (gst_riff_peek_head):
Fix for unaligned RIFF files (i.e. where all the chunks together
in a LIST chunk are not of the same size as the size given in
the LIST chunk header). Fixes several odd WAVE files. Also fix
ADPCM (block_align property) in audio, so that wavparse based
on this works now as it used to stand-alone.
2004-05-09 15:49:25 +00:00
Benjamin Otte
23c774e5a3 ext/: \1/Codec, (fixes #142193)
Original commit message from CVS:
reviewed by Benjamin Otte  <otte@gnome.org>
* ext/a52dec/gsta52dec.c:
* ext/divx/gstdivxdec.c:
* ext/divx/gstdivxenc.c:
* ext/dts/gstdtsdec.c: (gst_dtsdec_base_init):
* ext/faac/gstfaac.c: (gst_faac_base_init):
* ext/faad/gstfaad.c: (gst_faad_base_init):
* ext/ivorbis/vorbisfile.c:
* ext/lame/gstlame.c:
* ext/libfame/gstlibfame.c:
* ext/mpeg2enc/gstmpeg2enc.cc:
* ext/musicbrainz/gsttrm.c: (gst_musicbrainz_base_init):
* ext/sidplay/gstsiddec.cc:
* ext/speex/gstspeexdec.c:
* ext/speex/gstspeexenc.c:
* ext/xvid/gstxviddec.c:
* ext/xvid/gstxvidenc.c:
correct klasses. Mostly s,Codec/(Audio|Video),\1/Codec,
(fixes #142193)
2004-05-09 14:37:16 +00:00
Ronald S. Bultje
ec4ebf9d81 ext/alsa/: Fix alsa oddness in mixer after the combination of using mixer in source/sink elements and using hw:x,y in...
Original commit message from CVS:
* ext/alsa/gstalsa.c: (device_list),
(gst_alsa_class_probe_devices):
* ext/alsa/gstalsamixer.c: (gst_alsa_mixer_open):
Fix alsa oddness in mixer after the combination of using mixer
in source/sink elements and using hw:x,y instead of just hw:x.
2004-05-09 00:30:06 +00:00
Benjamin Otte
e9d5e3c0c4 gst/wavparse/gstwavparse.c: make PAUSED=>READY=>PAUSED=READY work by not destroying NULL sourcepads
Original commit message from CVS:
* gst/wavparse/gstwavparse.c: (gst_wavparse_destroy_sourcepad),
(gst_wavparse_create_sourcepad):
make PAUSED=>READY=>PAUSED=READY work by not destroying NULL
sourcepads
2004-05-09 00:13:39 +00:00
Benjamin Otte
6252bb414a ext/alsa/gstalsasink.c: allow discont events before caps nego
Original commit message from CVS:
* ext/alsa/gstalsasink.c: (gst_alsa_sink_check_event):
allow discont events before caps nego
2004-05-09 00:02:26 +00:00
Benjamin Otte
4f8ead4256 ext/vorbis/vorbisdec.c: don't leak events
Original commit message from CVS:
* ext/vorbis/vorbisdec.c: (vorbis_dec_event):
don't leak events
2004-05-08 16:30:03 +00:00
Benjamin Otte
54fa080844 gst/level/gstlevel.*: figure out if we're initialized directly instead of keeping a variable that's wrong in 90% of c...
Original commit message from CVS:
* gst/level/gstlevel.c: (gst_level_link), (gst_level_chain),
(gst_level_change_state), (gst_level_init):
* gst/level/gstlevel.h:
figure out if we're initialized directly instead of keeping a
variable that's wrong in 90% of cases
don't initialize pads and then leak them and use a new unitialized
pad. (fixes #142084)
these were bugs so n00bish I didn't find them for an hour :/
2004-05-08 13:03:59 +00:00
Iain Holmes
3a1737c076 Rewrote wavparse to use riff-read instead of doing bytestream stuff by hand.
Original commit message from CVS:
Rewrote wavparse to use riff-read instead of doing bytestream stuff by hand.
Made some useful functions in riff-read non-static.
2004-05-08 00:33:39 +00:00
David Schleef
5093ae66b9 ext/faad/gstfaad.c: HACK to correct signed char assumption in faad.h.
Original commit message from CVS:
* ext/faad/gstfaad.c: (gst_faad_sinkconnect): HACK to correct
signed char assumption in faad.h.
2004-05-08 00:20:18 +00:00
Ronald S. Bultje
304141bd77 sys/v4l2/gstv4l2src.c:
Original commit message from CVS:
* sys/v4l2/gstv4l2src.c: (gst_v4l2src_v4l2fourcc_to_caps):
Missing break, detected by Daniel Gazard <daniel.gazard@free.fr>.
2004-05-07 23:47:00 +00:00
Colin Walters
9d5d078004 fix a number of memleaks
Original commit message from CVS:
fix a number of memleaks
2004-05-07 20:26:45 +00:00
Jan Schmidt
e8ccbb5477 ext/dv/gstdvdec.c: Fix caps nego and pad templates. RGB mode caps should work now.
Original commit message from CVS:
* ext/dv/gstdvdec.c: (gst_dvdec_video_link):
Fix caps nego and pad templates. RGB mode caps should
work now.
* ext/dvdnav/gst-dvd:
Move mpeg2dec inside the thread because otherwise the
queue rejects cap changes mid-stream
* ext/mpeg2dec/gstmpeg2dec.c: (gst_mpeg2dec_get_type),
(gst_mpeg2dec_flush_decoder):
For mpeg2dec > 0.4.0, call the flush function instead of
manually extracting all in-flight frames.
* ext/raw1394/gstdv1394src.c: (gst_dv1394src_factory),
(gst_dv1394src_init), (gst_dv1394src_iso_receive):
Change mime type video/dv go video/x-dv to match the
rest of gst-plugins
2004-05-07 16:17:25 +00:00
Ronald S. Bultje
2e4b4c36af ext/alsa/: Make alsasink/src a subclass of alsamixer so that mixer stuff shows up in gst-rec. Needs some finetuning.
Original commit message from CVS:
* ext/alsa/gstalsamixer.c: (gst_alsa_mixer_build_list):
* ext/alsa/gstalsasink.c: (gst_alsa_sink_get_type),
(gst_alsa_sink_class_init):
* ext/alsa/gstalsasink.h:
* ext/alsa/gstalsasrc.c: (gst_alsa_src_get_type),
(gst_alsa_src_class_init):
* ext/alsa/gstalsasrc.h:
Make alsasink/src a subclass of alsamixer so that mixer stuff
shows up in gst-rec. Needs some finetuning.
2004-05-07 04:56:55 +00:00
Benjamin Otte
0d67d99151 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
2004-05-07 00:45:12 +00:00