summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d0c8e3a)
raw | patch | inline | side by side (parent: d0c8e3a)
| author | Andy Wingo <wingo@pobox.com> | |
| Wed, 11 Feb 2004 13:28:59 +0000 (13:28 +0000) | ||
| committer | Andy Wingo <wingo@pobox.com> | |
| Wed, 11 Feb 2004 13:28:59 +0000 (13:28 +0000) |
Original commit message from CVS:
whoops, de-conflictify
whoops, de-conflictify
| ChangeLog | patch | blob | history |
diff --git a/ChangeLog b/ChangeLog
index b5c6f5c9d9b6ebc7e8cc534ca09d9459946baac8..90f1b4ca4401f79098aec179922e14ceeefe214f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
revert patch that breaks applications, reapply after release
to get this fixed properly
->>>>>>> 1.222
2004-02-05 Benjamin Otte <in7y118@public.uni-hamburg.de>
* gst/gsttag.c: (_gst_tag_initialize):