commit 9c0d8ca71863814e6233740d3b1cb2eccfd1f3d1
author Wim Taymans <wim.taymans@collabora.co.uk> Tue Nov 08 12:54:15 2011 +0100
committer Wim Taymans <wim.taymans@collabora.co.uk> Tue Nov 08 12:54:15 2011 +0100
tree e3619996aa2614e62ae459a52ceceb50f0ac27cc
parent ce09010267fb12e01fff9f819f981818bbcbc295
parent ab8d5874b0b644dffa60e4744815009f3970fc84

Merge branch 'master' into 0.11

Conflicts:
	gst/gstelement.h
	gst/gstghostpad.c
	gst/gstminiobject.c

gst/gstelement.h

diff --git a/gst/gstelement.h b/gst/gstelement.h
index 9cc30ed..55714d8 100644
--- a/gst/gstelement.h
+++ b/gst/gstelement.h
@@ -598,7 +598,7 @@
  * @send_event: send a #GstEvent to the element
  * @get_query_types: get the supported #GstQueryType of this element
  * @query: perform a #GstQuery on the element
- * @state_changed: called immediately after a new state was set. Since: 0.10.35.
+ * @state_changed: called immediately after a new state was set.
  *
  * GStreamer element class. Override the vmethods to implement the element
  * functionality.