backmerge
authorThomas Vander Stichele <thomas@apestaart.org>
Fri, 1 Nov 2002 21:41:28 +0000 (21:41 +0000)
committerThomas Vander Stichele <thomas@apestaart.org>
Fri, 1 Nov 2002 21:41:28 +0000 (21:41 +0000)
commitad67a1081dbfac7ef538c07cea8b6fc198646ddc
treef8d458717fa49a8b3b84d28f6d2385e6aa1fa7b7
parent91b12107f6a134009995f01e0e923c24c7f5bd82
backmerge

Original commit message from CVS:
backmerge
ext/snapshot/gstsnapshot.c
ext/snapshot/gstsnapshot.h
gst-plugins.spec.in
gst/mixmatrix/mixmatrix.c
gst/smpte/paint.c