gstreamer/docs
Edward Hervey 17bfba09f1 Merge branch 'master' into 0.11
Conflicts:
	ext/ogg/gstoggdemux.c
	ext/pango/gsttextoverlay.c
	gst-libs/gst/audio/gstaudioencoder.c
	gst-libs/gst/audio/gstbaseaudiosrc.c
	gst/playback/gstsubtitleoverlay.c
	gst/videorate/gstvideorate.c
2011-09-23 18:27:11 +02:00
..
design Merge branch 'master' into 0.11 2011-09-23 18:27:11 +02:00
libs Merge branch 'master' into 0.11 2011-09-08 14:42:00 +02:00
plugins Merge branch 'master' into 0.11 2011-09-08 14:42:00 +02:00
random
.gitignore
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