talk about a painful merge
authorThomas Vander Stichele <thomas@apestaart.org>
Mon, 23 Sep 2002 09:39:33 +0000 (09:39 +0000)
committerThomas Vander Stichele <thomas@apestaart.org>
Mon, 23 Sep 2002 09:39:33 +0000 (09:39 +0000)
commit21dd80fa24962e9cefd6ff095ef93676b5c8c34e
tree03df0699638808888f9d32cb4fe537074565c31a
parentf44e8e3a50d0a95fb1844db76abd6321a512f8f1
talk about a painful merge

Original commit message from CVS:
talk about a painful merge
gst/adder/gstadder.c