diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-04-04 14:58:35 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-04-04 14:58:35 -0700 |
| commit | c1b8b17a7ac22123fe8d2d647265f19d2cc92625 (patch) | |
| tree | b7629da2b1b5bcb6755cb3343bef8f84c036f05e | |
| parent | 48395495d6f6602f666c11d0b38f6600b629ccfc (diff) | |
| parent | dd3f56789371c904c53f057b288cdcfc9cc56b25 (diff) | |
| download | emacs-c1b8b17a7ac22123fe8d2d647265f19d2cc92625.tar.gz | |
Merge from origin/emacs-24
dd3f567 Fix tramp-tests.el
Conflicts:
test/ChangeLog
| -rw-r--r-- | test/ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/test/ChangeLog b/test/ChangeLog index f7bec2ee119..4999576a878 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,8 @@ +2015-04-04 Michael Albinus <michael.albinus@gmx.de> + + * automated/tramp-tests.el (tramp-test06-directory-file-name): + Fix docstring and last test. + 2015-04-01 Artur Malabarba <bruce.connor.am@gmail.com> * automated/package-test.el: Avoid async while testing. |