Merge branch '0.10'
authorStefan Sauer <ensonic@users.sf.net>
Mon, 2 Apr 2012 19:15:09 +0000 (21:15 +0200)
committerStefan Sauer <ensonic@users.sf.net>
Mon, 2 Apr 2012 19:33:10 +0000 (21:33 +0200)
commit1074a4e99a473efd5ee690da9ecd797c55cec23a
treeb83054c4f32247615ed06aa34aef2c574446aad6
parentf3aad8b4306d786848af9c612a03c81bec30d25b
parentea9cc8c871eab95e6fdc268122c13d2706b3b63d
Merge branch '0.10'

Conflicts:
docs/gst/gstreamer-sections.txt
gst/Makefile.am
gst/gst.c
gst/gst.h
gst/gstevent.c
gst/gstevent.h
gst/gstmessage.h
gst/gstquark.c
gst/gstquark.h
gst/gstquery.c
gst/gstquery.h
tests/check/Makefile.am
18 files changed:
docs/design/Makefile.am
docs/gst/gstreamer-docs.sgml
docs/gst/gstreamer-sections.txt
gst/Makefile.am
gst/gst.c
gst/gst.h
gst/gst_private.h
gst/gstevent.c
gst/gstevent.h
gst/gstmessage.c
gst/gstmessage.h
gst/gstquark.c
gst/gstquark.h
gst/gstquery.c
gst/gstquery.h
gst/gsttoc.c
tests/check/Makefile.am
tools/gst-launch.c