From 06b99ec3aefd296b7014c74b5d80a38d3959221c Mon Sep 17 00:00:00 2001 From: Jan Schmidt Date: Mon, 16 Jan 2006 14:37:54 +0000 Subject: [PATCH] gst/gstminiobject.c: Spelling fix in docs. Original commit message from CVS: * gst/gstminiobject.c: Spelling fix in docs. * ChangeLog - remove conflict indicator --- ChangeLog | 7 ++++++- gst/gstminiobject.c | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index de3c480758..9a517a3435 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-01-16 Jan Schmidt + + * gst/gstminiobject.c: + Spelling fix in docs. + * ChangeLog - remove conflict indicator + 2006-01-16 Jan Schmidt 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 * gst/gstbin.c: (gst_bin_query): diff --git a/gst/gstminiobject.c b/gst/gstminiobject.c index efd69d817b..d81adba616 100644 --- a/gst/gstminiobject.c +++ b/gst/gstminiobject.c @@ -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)