summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorChristian Schaller <uraeus@gnome.org>2004-03-07 11:26:27 +0000
committerChristian Schaller <uraeus@gnome.org>2004-03-07 11:26:27 +0000
commit5aa8875165a582f5aa48c2137744609794040980 (patch)
treeaab15876b3c8f597c003ee193f05a0c9b677bc0a /ChangeLog
parentc2bd172e390be9f72bd2442a19dd2cd7c7705013 (diff)
downloadgst-plugins-bad-5aa8875165a582f5aa48c2137744609794040980.tar.gz
gst-plugins-bad-5aa8875165a582f5aa48c2137744609794040980.tar.bz2
gst-plugins-bad-5aa8875165a582f5aa48c2137744609794040980.zip
remove conflict indicators
Original commit message from CVS: remove conflict indicators
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 70672128..56f0e420 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -116,7 +116,6 @@
make sure to handle the case where there's no current chain
gracefully.
->>>>>>> 1.392
2004-03-05 David Schleef <ds@schleef.org>
* ext/aalib/gstaasink.c: (gst_aasink_fixate), (gst_aasink_init):