gstreamer/docs
Tim-Philipp Müller 822970901e Bump git version after unplanned 0.10.30 release
Merge branch '0.10.30'

Conflicts:
	configure.ac
	docs/plugins/inspect/plugin-1394.xml
	docs/plugins/inspect/plugin-aasink.xml
	docs/plugins/inspect/plugin-alaw.xml
	docs/plugins/inspect/plugin-alpha.xml
	docs/plugins/inspect/plugin-alphacolor.xml
	docs/plugins/inspect/plugin-annodex.xml
	docs/plugins/inspect/plugin-apetag.xml
	docs/plugins/inspect/plugin-audiofx.xml
	docs/plugins/inspect/plugin-audioparsers.xml
	docs/plugins/inspect/plugin-auparse.xml
	docs/plugins/inspect/plugin-autodetect.xml
	docs/plugins/inspect/plugin-avi.xml
	docs/plugins/inspect/plugin-cacasink.xml
	docs/plugins/inspect/plugin-cairo.xml
	docs/plugins/inspect/plugin-cutter.xml
	docs/plugins/inspect/plugin-debug.xml
	docs/plugins/inspect/plugin-deinterlace.xml
	docs/plugins/inspect/plugin-dv.xml
	docs/plugins/inspect/plugin-efence.xml
	docs/plugins/inspect/plugin-effectv.xml
	docs/plugins/inspect/plugin-equalizer.xml
	docs/plugins/inspect/plugin-esdsink.xml
	docs/plugins/inspect/plugin-flac.xml
	docs/plugins/inspect/plugin-flv.xml
	docs/plugins/inspect/plugin-flxdec.xml
	docs/plugins/inspect/plugin-gconfelements.xml
	docs/plugins/inspect/plugin-gdkpixbuf.xml
	docs/plugins/inspect/plugin-goom.xml
	docs/plugins/inspect/plugin-goom2k1.xml
	docs/plugins/inspect/plugin-gstrtpmanager.xml
	docs/plugins/inspect/plugin-halelements.xml
	docs/plugins/inspect/plugin-icydemux.xml
	docs/plugins/inspect/plugin-id3demux.xml
	docs/plugins/inspect/plugin-imagefreeze.xml
	docs/plugins/inspect/plugin-interleave.xml
	docs/plugins/inspect/plugin-isomp4.xml
	docs/plugins/inspect/plugin-jack.xml
	docs/plugins/inspect/plugin-jpeg.xml
	docs/plugins/inspect/plugin-level.xml
	docs/plugins/inspect/plugin-matroska.xml
	docs/plugins/inspect/plugin-mulaw.xml
	docs/plugins/inspect/plugin-multifile.xml
	docs/plugins/inspect/plugin-multipart.xml
	docs/plugins/inspect/plugin-navigationtest.xml
	docs/plugins/inspect/plugin-oss4.xml
	docs/plugins/inspect/plugin-ossaudio.xml
	docs/plugins/inspect/plugin-png.xml
	docs/plugins/inspect/plugin-pulseaudio.xml
	docs/plugins/inspect/plugin-replaygain.xml
	docs/plugins/inspect/plugin-rtp.xml
	docs/plugins/inspect/plugin-rtsp.xml
	docs/plugins/inspect/plugin-shapewipe.xml
	docs/plugins/inspect/plugin-shout2send.xml
	docs/plugins/inspect/plugin-smpte.xml
	docs/plugins/inspect/plugin-soup.xml
	docs/plugins/inspect/plugin-spectrum.xml
	docs/plugins/inspect/plugin-speex.xml
	docs/plugins/inspect/plugin-taglib.xml
	docs/plugins/inspect/plugin-udp.xml
	docs/plugins/inspect/plugin-video4linux2.xml
	docs/plugins/inspect/plugin-videobox.xml
	docs/plugins/inspect/plugin-videocrop.xml
	docs/plugins/inspect/plugin-videofilter.xml
	docs/plugins/inspect/plugin-videomixer.xml
	docs/plugins/inspect/plugin-wavenc.xml
	docs/plugins/inspect/plugin-wavpack.xml
	docs/plugins/inspect/plugin-wavparse.xml
	docs/plugins/inspect/plugin-ximagesrc.xml
	docs/plugins/inspect/plugin-y4menc.xml
	win32/common/config.h
2011-06-18 13:43:02 +01:00
..
plugins Bump git version after unplanned 0.10.30 release 2011-06-18 13:43:02 +01:00
random move 2005-11-30 18:28:53 +00:00
.gitignore maintenance commits 2005-09-05 13:18:42 +00:00
Makefile.am docs: Bump common. Use upload-doc.mak instead of upload.mak 2009-06-11 13:32:22 +01:00
version.entities.in commit new stuff 2005-08-30 19:20:02 +00:00