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 /lisp/emacs-lisp | |
| parent | 48395495d6f6602f666c11d0b38f6600b629ccfc (diff) | |
| parent | dd3f56789371c904c53f057b288cdcfc9cc56b25 (diff) | |
| download | emacs-c1b8b17a7ac22123fe8d2d647265f19d2cc92625.tar.gz emacs-c1b8b17a7ac22123fe8d2d647265f19d2cc92625.tar.bz2 emacs-c1b8b17a7ac22123fe8d2d647265f19d2cc92625.zip | |
Merge from origin/emacs-24
dd3f567 Fix tramp-tests.el
Conflicts:
test/ChangeLog
Diffstat (limited to 'lisp/emacs-lisp')
0 files changed, 0 insertions, 0 deletions