diff options
| author | Paul Eggert | 2011-06-11 14:32:21 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-06-11 14:32:21 -0700 |
| commit | 8eeb28635aafbbba375bc54cbccba2137d5a7aa2 (patch) | |
| tree | 510f7688dd8e049549c9eeaf56dfc622f007cbc3 /lisp/ChangeLog | |
| parent | 4475bec4dd51b8da9884816d9ca06e4d60a35e15 (diff) | |
| parent | def722bf0990b94cebf4c0761cd99dc3c0de6471 (diff) | |
| download | emacs-8eeb28635aafbbba375bc54cbccba2137d5a7aa2.tar.gz emacs-8eeb28635aafbbba375bc54cbccba2137d5a7aa2.zip | |
Merge from trunk.
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7c258be6d9b..08a3e4b3f3e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,13 @@ | |||
| 1 | 2011-06-11 Michael Albinus <michael.albinus@gmx.de> | ||
| 2 | |||
| 3 | * net/tramp.el (tramp-debug-message): Add `tramp-with-progress-reporter' | ||
| 4 | to ignored backtrace functions. | ||
| 5 | |||
| 6 | 2011-06-11 Glenn Morris <rgm@gnu.org> | ||
| 7 | |||
| 8 | * calendar/appt.el (appt-disp-window-function): Doc fix. | ||
| 9 | (appt-check): Handle overlapping appointments. (Bug#8337) | ||
| 10 | |||
| 1 | 2011-06-11 Martin Rudalics <rudalics@gmx.at> | 11 | 2011-06-11 Martin Rudalics <rudalics@gmx.at> |
| 2 | 12 | ||
| 3 | * window.el (window-tree-1, window-tree): New functions, moving | 13 | * window.el (window-tree-1, window-tree): New functions, moving |