Tim-Philipp Müller 4529c6dc32 Merge remote-tracking branch 'origin/master' into 0.11
Merge in doc updates for audio enums from 0.10, and get rid
of the #if #else in the enum list, since that confuses gtk-doc.

Conflicts:
	gst-libs/gst/audio/audio.c
	gst-libs/gst/audio/audio.h
2011-09-06 16:42:42 +01:00
..