summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@collabora.co.uk>2011-10-27 15:44:58 +0200
committerWim Taymans <wim.taymans@collabora.co.uk>2011-10-27 15:44:58 +0200
commit016d036137417662b97a59dee6402c62252e17af (patch)
treee20c51425da6e67f74769f6dd85964b8f0c09271 /Makefile.am
parentb21bb37657f773bf255c923620c55626d5abab4e (diff)
parent1a7acdc99e9355cdae4c50356346ffb0c06e7fc8 (diff)
Merge branch 'master' into 0.11
Conflicts: configure.ac gst-libs/gst/audio/gstbaseaudiosink.c gst/audioconvert/channelmixtest.c gst/playback/gstplaybasebin.c gst/playback/gstsubtitleoverlay.c tests/examples/Makefile.am tests/examples/audio/Makefile.am
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index 126379f39..0f329cb44 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -77,6 +77,7 @@ CRUFT_FILES = \
$(top_builddir)/common/shave \
$(top_builddir)/common/shave-libtool \
$(top_builddir)/gst-libs/gst/audio/testchannels \
+ $(top_builddir)/tests/examples/volume/volume \
$(top_builddir)/tools/gst-discoverer
CRUFT_DIRS = \