projects / platform / upstream / gstreamer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: dc4240d)
ChangeLog: Remove conflict marker from ChangeLog
authorJan Schmidt <thaytan@mad.scientist.com>
Wed, 31 Dec 2008 11:20:55 +0000 (11:20 +0000)
committerJan Schmidt <thaytan@mad.scientist.com>
Wed, 31 Dec 2008 11:20:55 +0000 (11:20 +0000)
Original commit message from CVS:
* ChangeLog:
Remove conflict marker from ChangeLog

ChangeLog patch | blob | history

diff --git a/ChangeLog b/ChangeLog
index c425999..8925983 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-31  Jan Schmidt  <jan.schmidt@sun.com>
+
+       * ChangeLog:
+       Remove conflict marker from ChangeLog
+
 2008-12-28  Edward Hervey  <edward.hervey@collabora.co.uk>
 
        Patch by: j^ <j at oil21.org>
@@ -210,7 +215,6 @@
        Make usage of libv4l optional by a configure parameter.
        Fixes bug #563504.
 
->>>>>>> 1.3872
 2008-12-05  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
 
        * docs/plugins/Makefile.am:
Domain: Multimedia / Media Common;