diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-10-27 15:44:58 +0200 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-10-27 15:44:58 +0200 |
| commit | 016d036137417662b97a59dee6402c62252e17af (patch) | |
| tree | e20c51425da6e67f74769f6dd85964b8f0c09271 /Makefile.am | |
| parent | b21bb37657f773bf255c923620c55626d5abab4e (diff) | |
| parent | 1a7acdc99e9355cdae4c50356346ffb0c06e7fc8 (diff) | |
| download | gst-plugins-base-016d036137417662b97a59dee6402c62252e17af.tar.gz gst-plugins-base-016d036137417662b97a59dee6402c62252e17af.tar.xz | |
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.am | 1 |
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 = \ |