diff options
| author | Eli Zaretskii | 2010-01-16 16:13:12 -0500 |
|---|---|---|
| committer | Eli Zaretskii | 2010-01-16 16:13:12 -0500 |
| commit | 5a876cd5f810b611f78dd4cf7a1673bffeea19a9 (patch) | |
| tree | 93d7479d8263fb828f95932a0cb3e3b0678fa996 /lisp/ChangeLog | |
| parent | b3108ead2d1691d8ad3005a6350c4febf92df2fb (diff) | |
| parent | abd5cfe880473c8da925d5b83e52c8019803d87d (diff) | |
| download | emacs-5a876cd5f810b611f78dd4cf7a1673bffeea19a9.tar.gz emacs-5a876cd5f810b611f78dd4cf7a1673bffeea19a9.zip | |
Merge from mainline.
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 ea7435c559d..5ff2d7b24c0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,14 @@ | |||
| 1 | 2010-01-16 Jari Aalto <jari.aalto@cante.net> | ||
| 2 | |||
| 3 | * pcmpl-unix.el (pcmpl-unix-read-passwd-file): Doc fix. | ||
| 4 | |||
| 5 | 2010-01-16 Chong Yidong <cyd@stupidchicken.com> | ||
| 6 | |||
| 7 | * emacs-lisp/cl-macs.el (defstruct): Doc fix (Bug#5267). | ||
| 8 | |||
| 9 | * startup.el (command-line): Remove unused --icon-type arg. | ||
| 10 | Handle --display arg, passing it to command-line-1 (Bug#5392). | ||
| 11 | |||
| 1 | 2010-01-16 Mario Lang <mlang@delysid.org> | 12 | 2010-01-16 Mario Lang <mlang@delysid.org> |
| 2 | 13 | ||
| 3 | * cedet/ede/cpp-root.el (ede-cpp-root-project): | 14 | * cedet/ede/cpp-root.el (ede-cpp-root-project): |