Wim Taymans e1287b97ab Merge branch 'master' into 0.11 ... Conflicts: ext/ogg/gstoggmux.c gst-libs/gst/audio/audio.c gst-libs/gst/audio/audio.h gst-libs/gst/audio/multichannel.h gst-libs/gst/pbutils/Makefile.am gst-libs/gst/pbutils/gstdiscoverer.c gst/playback/gstplaysinkaudioconvert.c gst/playback/gstplaysinkvideoconvert.c win32/common/libgstaudio.def		2011-08-29 11:37:36 +02:00
..
design	video: parse number of views	2011-08-22 15:57:30 +02:00
libs	Merge branch 'master' into 0.11	2011-08-29 11:37:36 +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