projects
/
platform
/
upstream
/
glib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
glib-unix: add function to ensure an fd is sealed
[platform/upstream/glib.git]
/
ChangeLog.pre-2-10
diff --git
a/ChangeLog.pre-2-10
b/ChangeLog.pre-2-10
index
9234d7f
..
b2074b9
100644
(file)
--- 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.
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
* 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
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.
* 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
2006-03-15 Matthias Clasen <mclasen@redhat.com>
* glib/goption.c (g_option_context_parse): Only set the prgname