Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Adjust docs

  • Loading branch information...
commit b6d9f42ab99f7be5261ae3442919fa22a6db2bbd 1 parent 6db9ec4
Matthias Clasen authored
8 ChangeLog
View
@@ -1,3 +1,9 @@
+2006-03-23 Matthias Clasen <mclasen@redhat.com>
+
+ Retroactively branch for 2.10 before the last commit.
+
+ * glib/gtimer.c: Change to "Since 2.12".
+
2006-03-23 Emmanuele Bassi <ebassi@cvs.gnome.org>
* configure.in: Check for timegm.
@@ -16,7 +22,6 @@
* configure.in: Added "ka" (Georgian) to ALL_LINGUAS
-=======
2006-03-20 Matthias Clasen <mclasen@redhat.com>
* 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 <mclasen@redhat.com>
* glib/goption.c (g_option_context_parse): Only set the prgname
8 ChangeLog.pre-2-10
View
@@ -1,3 +1,9 @@
+2006-03-23 Matthias Clasen <mclasen@redhat.com>
+
+ Retroactively branch for 2.10 before the last commit.
+
+ * glib/gtimer.c: Change to "Since 2.12".
+
2006-03-23 Emmanuele Bassi <ebassi@cvs.gnome.org>
* configure.in: Check for timegm.
@@ -16,7 +22,6 @@
* configure.in: Added "ka" (Georgian) to ALL_LINGUAS
-=======
2006-03-20 Matthias Clasen <mclasen@redhat.com>
* 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 <mclasen@redhat.com>
* glib/goption.c (g_option_context_parse): Only set the prgname
8 ChangeLog.pre-2-12
View
@@ -1,3 +1,9 @@
+2006-03-23 Matthias Clasen <mclasen@redhat.com>
+
+ Retroactively branch for 2.10 before the last commit.
+
+ * glib/gtimer.c: Change to "Since 2.12".
+
2006-03-23 Emmanuele Bassi <ebassi@cvs.gnome.org>
* configure.in: Check for timegm.
@@ -16,7 +22,6 @@
* configure.in: Added "ka" (Georgian) to ALL_LINGUAS
-=======
2006-03-20 Matthias Clasen <mclasen@redhat.com>
* 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 <mclasen@redhat.com>
* glib/goption.c (g_option_context_parse): Only set the prgname
4 glib/gtimer.c
View
@@ -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_)
Please sign in to comment.
Something went wrong with that request. Please try again.