diff options
| author | Chong Yidong | 2010-11-01 11:18:42 -0400 |
|---|---|---|
| committer | Chong Yidong | 2010-11-01 11:18:42 -0400 |
| commit | 91fd0b72816c99c0425ab783f6502a3e11f00956 (patch) | |
| tree | ef448f802994bd3b06c612a06e1ffd93f9493c6f /src/ChangeLog | |
| parent | a8039db123e0cdec9ce3bbc52bae6fbc8d99ca4c (diff) | |
| download | emacs-91fd0b72816c99c0425ab783f6502a3e11f00956.tar.gz emacs-91fd0b72816c99c0425ab783f6502a3e11f00956.zip | |
Fix error in last merge from branch.
Remove 2010-10-25 commit by Michael Albinus to dbusbind.c, which is
not intended for trunk.
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 868688f8c45..c76c62124fc 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -78,12 +78,6 @@ | |||
| 78 | when aborting on GTK. This requires using shut_down_emacs | 78 | when aborting on GTK. This requires using shut_down_emacs |
| 79 | directly instead of Fkill_emacs. | 79 | directly instead of Fkill_emacs. |
| 80 | 80 | ||
| 81 | 2010-10-31 Michael Albinus <michael.albinus@gmx.de> | ||
| 82 | |||
| 83 | * dbusbind.c (Fdbus_call_method_asynchronously) | ||
| 84 | (Fdbus_register_signal, Fdbus_register_method): Check, whether | ||
| 85 | `dbus-registered-objects-table' is initialized. | ||
| 86 | |||
| 87 | 2010-10-29 Eli Zaretskii <eliz@gnu.org> | 81 | 2010-10-29 Eli Zaretskii <eliz@gnu.org> |
| 88 | 82 | ||
| 89 | * emacs.c (main): Call syms_of_filelock unconditionally. | 83 | * emacs.c (main): Call syms_of_filelock unconditionally. |