removing conflict traces
authorThomas Vander Stichele <thomas@apestaart.org>
Thu, 25 Dec 2003 09:36:00 +0000 (09:36 +0000)
committerThomas Vander Stichele <thomas@apestaart.org>
Thu, 25 Dec 2003 09:36:00 +0000 (09:36 +0000)
commitd2b1c2c2f11c04ca04e3b713ecce565d8699871a
tree1b0f08e6e75360847cbae2f64d890ba43e5c7a33
parente4483907750e95825a794c9f5e0d05a96ee200be
removing conflict traces

Original commit message from CVS:
removing conflict traces
ChangeLog
docs/gst/tmpl/gstreamer-unused.sgml