From b6d9f42ab99f7be5261ae3442919fa22a6db2bbd Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 23 Mar 2006 13:38:17 +0000 Subject: [PATCH] Adjust docs --- ChangeLog | 8 ++++++-- ChangeLog.pre-2-10 | 8 ++++++-- ChangeLog.pre-2-12 | 8 ++++++-- glib/gtimer.c | 4 ++-- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9234d7f..b2074b9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-03-23 Matthias Clasen + + Retroactively branch for 2.10 before the last commit. + + * glib/gtimer.c: Change to "Since 2.12". + 2006-03-23 Emmanuele Bassi * configure.in: Check for timegm. @@ -16,7 +22,6 @@ * configure.in: Added "ka" (Georgian) to ALL_LINGUAS -======= 2006-03-20 Matthias Clasen * glib/gmem.c (profiler_log): use standard_calloc to allocate @@ -37,7 +42,6 @@ * MAINTAINERS: Add this, at the request of the GNOME sysadmin team. ->>>>>>> 1.2267 2006-03-15 Matthias Clasen * glib/goption.c (g_option_context_parse): Only set the prgname diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 9234d7f..b2074b9 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2006-03-23 Matthias Clasen + + Retroactively branch for 2.10 before the last commit. + + * glib/gtimer.c: Change to "Since 2.12". + 2006-03-23 Emmanuele Bassi * configure.in: Check for timegm. @@ -16,7 +22,6 @@ * configure.in: Added "ka" (Georgian) to ALL_LINGUAS -======= 2006-03-20 Matthias Clasen * glib/gmem.c (profiler_log): use standard_calloc to allocate @@ -37,7 +42,6 @@ * MAINTAINERS: Add this, at the request of the GNOME sysadmin team. ->>>>>>> 1.2267 2006-03-15 Matthias Clasen * glib/goption.c (g_option_context_parse): Only set the prgname diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 9234d7f..b2074b9 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,9 @@ +2006-03-23 Matthias Clasen + + Retroactively branch for 2.10 before the last commit. + + * glib/gtimer.c: Change to "Since 2.12". + 2006-03-23 Emmanuele Bassi * configure.in: Check for timegm. @@ -16,7 +22,6 @@ * configure.in: Added "ka" (Georgian) to ALL_LINGUAS -======= 2006-03-20 Matthias Clasen * glib/gmem.c (profiler_log): use standard_calloc to allocate @@ -37,7 +42,6 @@ * MAINTAINERS: Add this, at the request of the GNOME sysadmin team. ->>>>>>> 1.2267 2006-03-15 Matthias Clasen * glib/goption.c (g_option_context_parse): Only set the prgname diff --git a/glib/gtimer.c b/glib/gtimer.c index 2d7678b..402bee5 100644 --- a/glib/gtimer.c +++ b/glib/gtimer.c @@ -354,7 +354,7 @@ mktime_utc (struct tm *tm) * * Return value: %TRUE if the conversion was successful. * - * Since: 2.10 + * Since: 2.12 */ gboolean g_time_val_from_iso8601 (const gchar *iso_date, @@ -443,7 +443,7 @@ g_time_val_from_iso8601 (const gchar *iso_date, * * Return value: a newly allocated string containing a ISO 8601 date * - * Since: 2.10 + * Since: 2.12 */ gchar * g_time_val_to_iso8601 (GTimeVal *time_) -- 2.7.4