Wim Taymans 33467d9629 Merge branch 'master' into 0.11 ... Conflicts: configure.ac ext/pango/gsttextoverlay.c ext/theora/gsttheoradec.c gst/adder/gstadder.c gst/adder/gstadder.h gst/audioresample/gstaudioresample.c gst/encoding/gstencodebin.c gst/playback/gstdecodebin.c gst/playback/gstdecodebin2.c tests/check/elements/decodebin2.c tests/check/elements/playbin-compressed.c win32/common/libgsttag.def		2011-08-16 18:01:14 +02:00
..
design	Merge remote-tracking branch 'origin/master' into 0.11	2011-06-26 21:27:28 +01:00
libs	Merge branch 'master' into 0.11	2011-08-16 18:01:14 +02:00
plugins	ffmpegcolorspace -> videoconvert	2011-07-07 23:59:59 +01:00
random	ignore more	2005-11-30 17:45:21 +00:00
.gitignore	first stab at documenting elements	2005-08-05 17:13:10 +00:00
Makefile.am	make: move the design doc also on the Makefile.am level (for dist)	2010-12-13 12:36:47 +02:00
version.entities.in	Added boilerplate gtk-doc files for plugin-libs documentation.	2004-12-20 16:29:06 +00:00