diff --git a/ChangeLog b/ChangeLog index b6d726b653..6044325849 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ 2003-12-25 Thomas Vander Stichele - * docs/gst/tmpl/gstreamer-unused.sgml: + * gst/gstinfo.h: + fix GST_DEBUG_CATEGORY_INIT gtk-doc description + * docs/gst/tmpl/gstreamer-unused.sgml: removed all traces of cvs conflicts 2003-12-24 Thomas Vander Stichele diff --git a/gst/gstinfo.h b/gst/gstinfo.h index dad7a336a1..7d7e6922cd 100644 --- a/gst/gstinfo.h +++ b/gst/gstinfo.h @@ -235,8 +235,9 @@ GstDebugCategory *_gst_debug_category_new (gchar * name, * @color: the colors to use for a color representation or 0 for no color. * @description: optional description of the category. * - * Returns: a new #GstDebugCategory with the given properties and set to + * Initializes a new #GstDebugCategory with the given properties and set to * the default threshold. + * * * * This macro expands to nothing if debugging is disabled.