diff options
| author | Eli Zaretskii | 2013-03-31 15:36:07 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2013-03-31 15:36:07 +0300 |
| commit | 65d72c1bf862d339d72d760e7ac8ccbc4837f06b (patch) | |
| tree | 3d902ee01eda40ee5975dc42277e2495cef2996c /lisp | |
| parent | f1aa11971a74b7b2fa0f5baaaaf21dfbd388de6b (diff) | |
| parent | 6ea3f01e74cbae9dc1366a07aea09d9665167981 (diff) | |
| download | emacs-65d72c1bf862d339d72d760e7ac8ccbc4837f06b.tar.gz emacs-65d72c1bf862d339d72d760e7ac8ccbc4837f06b.zip | |
Merge from trunk.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d1b827966de..ced7672ef99 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -80,7 +80,7 @@ | |||
| 80 | 80 | ||
| 81 | 2013-03-27 Aidan Gauland <aidalgol@no8wireless.co.nz> | 81 | 2013-03-27 Aidan Gauland <aidalgol@no8wireless.co.nz> |
| 82 | 82 | ||
| 83 | * eshell/em-unix.el: Moved su and sudo to... | 83 | * eshell/em-unix.el: Move su and sudo to... |
| 84 | * eshell/em-tramp.el: ...Eshell tramp module | 84 | * eshell/em-tramp.el: ...Eshell tramp module |
| 85 | 85 | ||
| 86 | 2013-03-26 Stefan Monnier <monnier@iro.umontreal.ca> | 86 | 2013-03-26 Stefan Monnier <monnier@iro.umontreal.ca> |
| @@ -1083,8 +1083,8 @@ | |||
| 1083 | 1083 | ||
| 1084 | 2013-02-18 Aidan Gauland <aidalgol@no8wireless.co.nz> | 1084 | 2013-02-18 Aidan Gauland <aidalgol@no8wireless.co.nz> |
| 1085 | 1085 | ||
| 1086 | * eshell/em-cmpl.el: Corrected "context-related help" | 1086 | * eshell/em-cmpl.el: Correct "context-related help" keybinding in |
| 1087 | keybinding in commentary. | 1087 | commentary. |
| 1088 | 1088 | ||
| 1089 | 2013-02-18 Michael Heerdegen <michael_heerdegen@web.de> | 1089 | 2013-02-18 Michael Heerdegen <michael_heerdegen@web.de> |
| 1090 | 1090 | ||