diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-01-10 14:32:32 +0100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-01-10 14:32:32 +0100 |
| commit | 93e3ed5a869afb79f9658f22ced4691ce475e8a1 (patch) | |
| tree | baaec96daaf22857d61128401c12e2649ef25304 /Makefile.am | |
| parent | 692e00cc00d772fe2b01f518cb9ac88d124807d1 (diff) | |
| parent | 2b2c0940f1b7ce8a858a26ad5e246fd645a83830 (diff) | |
Merge branch 'master' into 0.11
Conflicts:
ext/cairo/gsttextoverlay.c
ext/pulse/pulseaudiosink.c
gst/audioparsers/gstaacparse.c
gst/avi/gstavimux.c
gst/flv/gstflvmux.c
gst/interleave/interleave.c
gst/isomp4/gstqtmux.c
gst/matroska/matroska-demux.c
gst/matroska/matroska-mux.c
gst/matroska/matroska-mux.h
gst/matroska/matroska-read-common.c
gst/multifile/gstmultifilesink.c
gst/multipart/multipartmux.c
gst/shapewipe/gstshapewipe.c
gst/smpte/gstsmpte.c
gst/udp/gstmultiudpsink.c
gst/videobox/gstvideobox.c
gst/videocrop/gstaspectratiocrop.c
gst/videomixer/videomixer.c
gst/videomixer/videomixer2.c
gst/wavparse/gstwavparse.c
po/ja.po
po/lv.po
po/sr.po
tests/check/Makefile.am
tests/check/elements/qtmux.c
tests/check/elements/rgvolume.c
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 0119fad4c..9638883cb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,7 +26,8 @@ DISTCLEANFILES = _stdint.h noinst_HEADERS = \ gst-libs/gst/gettext.h \ - gst-libs/gst/gst-i18n-plugin.h + gst-libs/gst/gst-i18n-plugin.h \ + gst-libs/gst/glib-compat-private.h ACLOCAL_AMFLAGS = -I m4 -I common/m4 |