diff options
| author | Christian Schaller <uraeus@gnome.org> | 2004-09-25 14:54:01 +0000 |
|---|---|---|
| committer | Christian Schaller <uraeus@gnome.org> | 2004-09-25 14:54:01 +0000 |
| commit | aedb2eb2bcd1785e11f6a3c20531cbdbdc43aa33 (patch) | |
| tree | 99f45ecad15a64b2ac8e2c8eca6c737473169ad5 | |
| parent | 037cc62fc6c6c2ebe3355425912d92711d7e7a90 (diff) | |
| download | gst-plugins-bad-aedb2eb2bcd1785e11f6a3c20531cbdbdc43aa33.tar.gz gst-plugins-bad-aedb2eb2bcd1785e11f6a3c20531cbdbdc43aa33.tar.bz2 gst-plugins-bad-aedb2eb2bcd1785e11f6a3c20531cbdbdc43aa33.zip | |
remove changelog conflict indicators
Original commit message from CVS:
remove changelog conflict indicators
| -rw-r--r-- | ChangeLog | 2 |
1 files changed, 0 insertions, 2 deletions
@@ -116,7 +116,6 @@ * gst/multifilesink/gstmultifilesink.h: add support for streamheader in multifilesink ->>>>>>> 1.1087 2004-09-22 Ronald S. Bultje <rbultje@ronald.bitfreak.net> * gst/asfdemux/gstasfdemux.c: (_read_var_length), (_read_guid), @@ -1428,7 +1427,6 @@ * testsuite/alsa/srcstate.c: add test for alsasrc changing state ->>>>>>> 1.958 2004-07-27 Zaheer Abbas Merali <zaheerabbas at merali dot org> * gst/silence/gstsilence.c: (gst_silence_init), (gst_silence_link), |