Merge branch 'master' of ssh://uraeus@git.freedesktop.org/git/gstreamer/gst-plugins-bad

This commit is contained in:
Christian Schaller 2009-03-04 15:30:04 +00:00
commit 9b3c59ccde

View file

@ -113,3 +113,4 @@ elements_camerabin_SOURCES = elements/camerabin.c
elements_timidity_CFLAGS = $(GST_BASE_CFLAGS) $(AM_CFLAGS) elements_timidity_CFLAGS = $(GST_BASE_CFLAGS) $(AM_CFLAGS)
elements_timidity_LDADD = $(GST_BASE_LIBS) $(LDADD) elements_timidity_LDADD = $(GST_BASE_LIBS) $(LDADD)
EXTRA_DIST = gst-plugins-bad.supp