projects / platform / upstream / gstreamer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 07e516e)
ChangeLog surgery: remove junk
authorTim-Philipp Müller <tim@centricular.net>
Wed, 20 Sep 2006 10:42:34 +0000 (10:42 +0000)
committerTim-Philipp Müller <tim@centricular.net>
Wed, 20 Sep 2006 10:42:34 +0000 (10:42 +0000)
Original commit message from CVS:
ChangeLog surgery: remove junk

ChangeLog patch | blob | history

diff --git a/ChangeLog b/ChangeLog
index 2a32766..8e77dcf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -196,7 +196,6 @@
        Make queue_threshold variable big enough to store a uint64 time value.
        API: playbin::queue-min-threshold property.
 
->>>>>>> 1.2883
 2006-09-15  Wim Taymans  <wim@fluendo.com>
 
        * configure.ac:
Domain: Multimedia / Media Common;