X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=ChangeLog.pre-2-10;h=b2074b9986f5bb8d94d3bade97899bc4d3ee20ec;hb=601c4510b88edf52f9d7e57d228840c14576bf43;hp=9234d7f5e916265dad05a504ec45e89cfd425b86;hpb=6db9ec40708a4ad60a11a21856a1d54a48b01abd;p=platform%2Fupstream%2Fglib.git

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 <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