Sebastian Dröge 93e3ed5a86 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		2012-01-10 14:32:32 +01:00
..
elements	Merge branch 'master' into 0.11	2012-01-10 14:32:32 +01:00
generic	tests: fix some unit tests	2012-01-03 10:26:48 +01:00
pipelines	tests: rewrite test a little	2012-01-03 14:42:28 +01:00
.gitignore	tests: ignore sub-directory with orc tests	2010-06-17 16:41:56 +01:00
gst-plugins-good.supp	Add a few libjpeg suppressions and initialize a variable to make smokeenc valgrind clean. Fixes bug #515701.	2008-02-12 05:14:16 +00:00
Makefile.am	Merge branch 'master' into 0.11	2012-01-10 14:32:32 +01:00