• Sebastian Dröge's avatar
    Merge branch 'master' into 0.11 · 93e3ed5a
    Sebastian Dröge authored
    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
    93e3ed5a
Makefile.am 2.23 KB