Wim Taymans 7ac25e9b26 Merge branch 'master' into 0.11 ...

Conflicts:
	common
	configure.ac
	gst-libs/gst/audio/gstbaseaudiosink.c
	gst/playback/gstdecodebin2.c
	gst/playback/gstplaysinkaudioconvert.c
	gst/playback/gstplaysinkaudioconvert.h
	gst/playback/gstplaysinkvideoconvert.c
	gst/playback/gstplaysinkvideoconvert.h

2011-11-07 12:23:15 +01:00

..

design

Merge branch 'master' into 0.11

2011-11-07 12:23:15 +01:00

libs

Really remove all mention of gstnetbuffer

2011-11-04 09:01:36 +01:00

plugins

Merge branch 'master' into 0.11

2011-09-08 14:42:00 +02: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