diff options
| author | Paul Eggert | 2011-09-25 14:06:35 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-09-25 14:06:35 -0700 |
| commit | 60b5d3ca2bf381f450da02e3936f7b43b7ca2dab (patch) | |
| tree | c6c6a4a25dcb51c932217f0081690539ee43a175 /lisp/ChangeLog | |
| parent | 1a2f43d0db92546dab765bc947f70bc7d2e4fee0 (diff) | |
| parent | b2bf61aa89138859313b14cde43face3e5dfc44a (diff) | |
| download | emacs-60b5d3ca2bf381f450da02e3936f7b43b7ca2dab.tar.gz emacs-60b5d3ca2bf381f450da02e3936f7b43b7ca2dab.zip | |
Merge from trunk.
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 662dd7a7f99..92324036dc5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,14 @@ | |||
| 1 | 2011-09-25 Michael Albinus <michael.albinus@gmx.de> | ||
| 2 | |||
| 3 | * net/dbus.el (dbus-unregister-object): Don't release services for | ||
| 4 | registered signals. (Bug#9581) | ||
| 5 | |||
| 6 | 2011-09-25 Teodor Zlatanov <tzz@lifelogs.com> | ||
| 7 | |||
| 8 | * progmodes/cfengine.el (cfengine-auto-mode): Add convenience | ||
| 9 | function that picks between cfengine 2 and 3 support | ||
| 10 | automatically. Update docs accordingly. | ||
| 11 | |||
| 1 | 2011-09-22 Ken Manheimer <ken.manheimer@gmail.com> | 12 | 2011-09-22 Ken Manheimer <ken.manheimer@gmail.com> |
| 2 | 13 | ||
| 3 | * allout.el (allout-this-command-hid-stuff): Buffer-local variable | 14 | * allout.el (allout-this-command-hid-stuff): Buffer-local variable |