gst/gstminiobject.c: Spelling fix in docs.

Original commit message from CVS:
* gst/gstminiobject.c:
Spelling fix in docs.
* ChangeLog - remove conflict indicator
This commit is contained in:
Jan Schmidt 2006-01-16 14:37:54 +00:00
parent e44a99a878
commit 06b99ec3ae
2 changed files with 7 additions and 2 deletions

View file

@ -1,3 +1,9 @@
2006-01-16 Jan Schmidt <thaytan@mad.scientist.com>
* gst/gstminiobject.c:
Spelling fix in docs.
* ChangeLog - remove conflict indicator
2006-01-16 Jan Schmidt <thaytan@mad.scientist.com>
Reviewed By: Andy Wingo
@ -225,7 +231,6 @@
macro, so that gcc doesn't complain if the -Wmissing-prototypes
compiler switch is being used (#325429).
>>>>>>> 1.2159
2005-12-29 Tim-Philipp Müller <tim at centricular dot net>
* gst/gstbin.c: (gst_bin_query):

View file

@ -209,7 +209,7 @@ gst_mini_object_is_writable (const GstMiniObject * mini_object)
*
* MT safe
*
* Returns: a mini-object (possibly a duplicate) that it writable.
* Returns: a mini-object (possibly a duplicate) that is writable.
*/
GstMiniObject *
gst_mini_object_make_writable (GstMiniObject * mini_object)