diff src/ChangeLog @ 111311:cf216ba9dc87

Fix error in last merge from branch. Remove 2010-10-25 commit by Michael Albinus to dbusbind.c, which is not intended for trunk.
author Chong Yidong <cyd@stupidchicken.com>
date Mon, 01 Nov 2010 11:18:42 -0400
parents 8ddff723bc6f
children 230a50b33a46
line wrap: on
line diff
--- a/src/ChangeLog	Mon Nov 01 15:59:31 2010 +0100
+++ b/src/ChangeLog	Mon Nov 01 11:18:42 2010 -0400
@@ -78,12 +78,6 @@
 	when aborting on GTK.  This requires using shut_down_emacs
 	directly instead of Fkill_emacs.
 
-2010-10-31  Michael Albinus  <michael.albinus@gmx.de>
-
-	* dbusbind.c (Fdbus_call_method_asynchronously)
-	(Fdbus_register_signal, Fdbus_register_method): Check, whether
-	`dbus-registered-objects-table' is initialized.
-
 2010-10-29  Eli Zaretskii  <eliz@gnu.org>
 
 	* emacs.c (main): Call syms_of_filelock unconditionally.