diff options
| author | Glenn Morris | 2013-07-25 00:10:56 -0700 |
|---|---|---|
| committer | Glenn Morris | 2013-07-25 00:10:56 -0700 |
| commit | 6ccb9cab43613632ece4f62d9ee28d694bc1d666 (patch) | |
| tree | 7d7cad1ad57fcea32f5499bc3131e4392fa56adc /lisp/ChangeLog | |
| parent | ef75383cd2b764f8df0b84f780adfe0bd552457c (diff) | |
| parent | ff62aabc622fdf35aaa878fd284f446de85fc5fd (diff) | |
| download | emacs-6ccb9cab43613632ece4f62d9ee28d694bc1d666.tar.gz emacs-6ccb9cab43613632ece4f62d9ee28d694bc1d666.zip | |
Merge from emacs-24; up to 2013-01-01T11:02:14Z!rudalics@gmx.at
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 85c68323cfe..358a23450a8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-07-25 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * dired-x.el (dired-mark-extension): Convert comment to doc string. | ||
| 4 | |||
| 1 | 2013-07-25 Juanma Barranquero <lekktu@gmail.com> | 5 | 2013-07-25 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 6 | ||
| 3 | * desktop.el (desktop--make-frame): Do not pass the `fullscreen' | 7 | * desktop.el (desktop--make-frame): Do not pass the `fullscreen' |