summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFederico Mena Quintero <federico@gnu.org>2008-05-10 01:09:37 +0000
committerFederico Mena Quintero <federico@src.gnome.org>2008-05-10 01:09:37 +0000
commit4cf20b979aef45b0e27838763987430ab0a56842 (patch)
treec7ad415e35ed6071c1c34edc7c53ab8af00a465f
parent774445a21f52cac85876f7934d348f84c370e57b (diff)
downloadgvfs-4cf20b979aef45b0e27838763987430ab0a56842.tar.gz
Oops, fix the ChangeLog
Signed-off-by: Federico Mena Quintero <federico@gnu.org> svn path=/branches/gnome-2-22/; revision=1764
-rw-r--r--ChangeLog6
1 files changed, 3 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 636f3f3d..914fd4ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,8 @@
g_strdup() the UDI. We can't just steal it, since it comes from
libhal, which uses strdup() (and we do g_free() in our finalizer).
+ * hal/hal-pool.c (hal_pool_new): Free the actual device strings here.
+
2008-04-22 Benjamin Otte <otte@gnome.org>
* */*.[ch]: get rid of modelines
@@ -185,9 +187,7 @@
Post release version bump
=== gvfs 0.2.2 ===
-=======
- * hal/hal-pool.c (hal_pool_new): Free the actual device strings here.
->>>>>>> bgo532375 - fix strdup and g_free() confusion
+
2008-05-09 Federico Mena Quintero <federico@novell.com>:ChangeLog
2008-03-28 Alexander Larsson <alexl@redhat.com>