summaryrefslogtreecommitdiff
path: root/ChangeLog.pre-2-10
diff options
context:
space:
mode:
authorMatthias Clasen <matthiasc@src.gnome.org>2006-03-23 13:38:17 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2006-03-23 13:38:17 +0000
commitb6d9f42ab99f7be5261ae3442919fa22a6db2bbd (patch)
tree949c1f092eb283c7e7524eaefeff31271d16afd6 /ChangeLog.pre-2-10
parent6db9ec40708a4ad60a11a21856a1d54a48b01abd (diff)
Adjust docs
Diffstat (limited to 'ChangeLog.pre-2-10')
-rw-r--r--ChangeLog.pre-2-108
1 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 9234d7f5e..b2074b998 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -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