summaryrefslogtreecommitdiffstats
path: root/gst/app
diff options
context:
space:
mode:
authorDave Robillard <dave@drobilla.net>2009-06-22 17:04:00 -0400
committerDave Robillard <dave@drobilla.net>2009-06-22 17:04:00 -0400
commit218878de5ea48b5acdf36070a73a50fd71f41741 (patch)
tree12384ce50f1af7eb61c2c18a0d6141595797bc53 /gst/app
parent925e83ee60c5406b2e5f0f39b0da0f90370efc27 (diff)
parenta2a0322df9a7005a01aafb5efc32fcc1179d205c (diff)
downloadgst-plugins-bad-218878de5ea48b5acdf36070a73a50fd71f41741.tar.gz
gst-plugins-bad-218878de5ea48b5acdf36070a73a50fd71f41741.tar.bz2
gst-plugins-bad-218878de5ea48b5acdf36070a73a50fd71f41741.zip
Merge branch 'master' of git://anongit.freedesktop.org/gstreamer/gst-plugins-bad into fdo
Conflicts: ext/ladspa/Makefile.am ext/ladspa/gstladspa.h ext/lv2/Makefile.am ext/lv2/gstlv2.h
Diffstat (limited to 'gst/app')
0 files changed, 0 insertions, 0 deletions