projects / platform / upstream / gstreamer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1457b69)
remove conflict doobers
authorAndy Wingo <wingo@pobox.com>
Fri, 27 May 2005 09:28:05 +0000 (09:28 +0000)
committerAndy Wingo <wingo@pobox.com>
Fri, 27 May 2005 09:28:05 +0000 (09:28 +0000)
Original commit message from CVS:
remove conflict doobers

ChangeLog patch | blob | history

diff --git a/ChangeLog b/ChangeLog
index 74db72c4dea5c973d0ac1198cadd0cbdce12b788..61b678cd3f4e7faa3f8ef68a658c01112e5989ed 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3868,7 +3868,6 @@
        * gst/elements/gstidentity.h:
        Added datarate properties to limit the datarate.
 
->>>>>>> 1.808
 2004-08-25  Benjamin Otte  <in7y118@public.uni-hamburg.de>
 
        * gst/autoplug/gstspider.c: (plugin_init):
Domain: Multimedia / Media Common;