projects / platform / upstream / gstreamer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 57bbd90)
remove a cvs merge leftover
authorDavid I. Lehn <dlehn@users.sourceforge.net>
Mon, 7 Jan 2002 22:35:26 +0000 (22:35 +0000)
committerDavid I. Lehn <dlehn@users.sourceforge.net>
Mon, 7 Jan 2002 22:35:26 +0000 (22:35 +0000)
Original commit message from CVS:
remove a cvs merge leftover

ChangeLog patch | blob | history

diff --git a/ChangeLog b/ChangeLog
index cc096a6..61f1a9b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -133,7 +133,6 @@
 
        * lots of build fixes for 0.3.0 release
 
->>>>>>> 1.3.2.2
 2001-08-15 23:43  cael
 
        * gstplay/: ChangeLog, gstmediaplay.c, gstplay.c: Added hacky check
Domain: Multimedia / Media Common;