diff options
| author | Michael Albinus | 2011-03-12 16:19:29 +0100 |
|---|---|---|
| committer | Michael Albinus | 2011-03-12 16:19:29 +0100 |
| commit | f3afd36bad9bc292e23dc638d6a80c636954cfc0 (patch) | |
| tree | ea98d4616842f4fdcb5637ad4aaddf07c106273a /lisp/ChangeLog | |
| parent | ecb0f94d1879163e49de80fe46dd2bee94615331 (diff) | |
| download | emacs-f3afd36bad9bc292e23dc638d6a80c636954cfc0.tar.gz emacs-f3afd36bad9bc292e23dc638d6a80c636954cfc0.zip | |
Sync with Tramp 2.2.1.
* net/tramp-sh.el (tramp-methods): Exchange "%k" marker with options.
* net/trampver.el: Update release number.
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8415861e292..cb7272ded58 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,11 @@ | |||
| 1 | 2011-03-12 Michael Albinus <michael.albinus@gmx.de> | ||
| 2 | |||
| 3 | Sync with Tramp 2.2.1. | ||
| 4 | |||
| 5 | * net/tramp-sh.el (tramp-methods): Exchange "%k" marker with options. | ||
| 6 | |||
| 7 | * net/trampver.el: Update release number. | ||
| 8 | |||
| 1 | 2011-03-12 Stefan Monnier <monnier@iro.umontreal.ca> | 9 | 2011-03-12 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 10 | ||
| 3 | * progmodes/compile.el (compilation--previous-directory): Fix up | 11 | * progmodes/compile.el (compilation--previous-directory): Fix up |