tree 1fdc8aeea38d819bd492a5899ce38c58133a889c
parent dc3ace8e980cdf01254100d9e6b4fdce75304189
parent c372e7c345f2137ddff5ba35ef4f99ac6ee44cb1
author Sebastian Dröge <slomo@circular-chaos.org> 1380032677 +0200
committer Sebastian Dröge <slomo@circular-chaos.org> 1380032677 +0200

Merge tag 'upstream/1.2.0'

Upstream version 1.2.0

Conflicts:
	ChangeLog
	NEWS
	RELEASE
	configure
	configure.ac
	docs/libs/html/gst-plugins-base-libs-gstpluginsbaseversion.html
	docs/libs/html/index.html
	docs/plugins/html/gst-plugins-base-plugins-plugin-adder.html
	docs/plugins/html/gst-plugins-base-plugins-plugin-alsa.html
	docs/plugins/html/gst-plugins-base-plugins-plugin-app.html
	docs/plugins/html/gst-plugins-base-plugins-plugin-audioconvert.html
	docs/plugins/html/gst-plugins-base-plugins-plugin-audiorate.html
	docs/plugins/html/gst-plugins-base-plugins-plugin-audioresample.html
	docs/plugins/html/gst-plugins-base-plugins-plugin-audiotestsrc.html
	docs/plugins/html/gst-plugins-base-plugins-plugin-cdparanoia.html
	docs/plugins/html/gst-plugins-base-plugins-plugin-encoding.html
	docs/plugins/html/gst-plugins-base-plugins-plugin-gio.html
	docs/plugins/html/gst-plugins-base-plugins-plugin-libvisual.html
	docs/plugins/html/gst-plugins-base-plugins-plugin-ogg.html
	docs/plugins/html/gst-plugins-base-plugins-plugin-pango.html
	docs/plugins/html/gst-plugins-base-plugins-plugin-playback.html
	docs/plugins/html/gst-plugins-base-plugins-plugin-subparse.html
	docs/plugins/html/gst-plugins-base-plugins-plugin-tcp.html
	docs/plugins/html/gst-plugins-base-plugins-plugin-theora.html
	docs/plugins/html/gst-plugins-base-plugins-plugin-typefindfunctions.html
	docs/plugins/html/gst-plugins-base-plugins-plugin-videoconvert.html
	docs/plugins/html/gst-plugins-base-plugins-plugin-videorate.html
	docs/plugins/html/gst-plugins-base-plugins-plugin-videoscale.html
	docs/plugins/html/gst-plugins-base-plugins-plugin-videotestsrc.html
	docs/plugins/html/gst-plugins-base-plugins-plugin-volume.html
	docs/plugins/html/gst-plugins-base-plugins-plugin-vorbis.html
	docs/plugins/html/gst-plugins-base-plugins-plugin-ximagesink.html
	docs/plugins/html/gst-plugins-base-plugins-plugin-xvimagesink.html
	docs/plugins/html/index.html
	docs/plugins/inspect/plugin-adder.xml
	docs/plugins/inspect/plugin-alsa.xml
	docs/plugins/inspect/plugin-app.xml
	docs/plugins/inspect/plugin-audioconvert.xml
	docs/plugins/inspect/plugin-audiorate.xml
	docs/plugins/inspect/plugin-audioresample.xml
	docs/plugins/inspect/plugin-audiotestsrc.xml
	docs/plugins/inspect/plugin-cdparanoia.xml
	docs/plugins/inspect/plugin-encoding.xml
	docs/plugins/inspect/plugin-gio.xml
	docs/plugins/inspect/plugin-ivorbisdec.xml
	docs/plugins/inspect/plugin-libvisual.xml
	docs/plugins/inspect/plugin-ogg.xml
	docs/plugins/inspect/plugin-pango.xml
	docs/plugins/inspect/plugin-playback.xml
	docs/plugins/inspect/plugin-subparse.xml
	docs/plugins/inspect/plugin-tcp.xml
	docs/plugins/inspect/plugin-theora.xml
	docs/plugins/inspect/plugin-typefindfunctions.xml
	docs/plugins/inspect/plugin-videoconvert.xml
	docs/plugins/inspect/plugin-videorate.xml
	docs/plugins/inspect/plugin-videoscale.xml
	docs/plugins/inspect/plugin-videotestsrc.xml
	docs/plugins/inspect/plugin-volume.xml
	docs/plugins/inspect/plugin-vorbis.xml
	docs/plugins/inspect/plugin-ximagesink.xml
	docs/plugins/inspect/plugin-xvimagesink.xml
	gst-plugins-base.doap
	gst-plugins-base.spec
	po/af.gmo
	po/af.po
	po/az.gmo
	po/az.po
	po/bg.gmo
	po/bg.po
	po/ca.gmo
	po/ca.po
	po/cs.gmo
	po/cs.po
	po/da.gmo
	po/da.po
	po/de.gmo
	po/de.po
	po/el.gmo
	po/el.po
	po/en_GB.gmo
	po/en_GB.po
	po/eo.gmo
	po/eo.po
	po/es.gmo
	po/es.po
	po/eu.gmo
	po/eu.po
	po/fi.gmo
	po/fi.po
	po/fr.gmo
	po/fr.po
	po/gl.gmo
	po/gl.po
	po/gst-plugins-base-1.0.pot
	po/hr.gmo
	po/hr.po
	po/hu.gmo
	po/hu.po
	po/id.gmo
	po/id.po
	po/it.gmo
	po/it.po
	po/ja.gmo
	po/ja.po
	po/lt.gmo
	po/lt.po
	po/lv.gmo
	po/lv.po
	po/nb.gmo
	po/nb.po
	po/nl.gmo
	po/nl.po
	po/or.gmo
	po/or.po
	po/pl.gmo
	po/pl.po
	po/pt_BR.gmo
	po/pt_BR.po
	po/ro.gmo
	po/ro.po
	po/ru.gmo
	po/ru.po
	po/sk.gmo
	po/sk.po
	po/sl.gmo
	po/sl.po
	po/sq.gmo
	po/sq.po
	po/sr.gmo
	po/sr.po
	po/sv.gmo
	po/sv.po
	po/tr.gmo
	po/tr.po
	po/uk.gmo
	po/uk.po
	po/vi.gmo
	po/vi.po
	po/zh_CN.gmo
	po/zh_CN.po
	win32/common/_stdint.h
	win32/common/config.h