diff options
| author | Fabián Ezequiel Gallina | 2014-12-27 13:16:44 -0300 |
|---|---|---|
| committer | Fabián Ezequiel Gallina | 2014-12-27 13:16:44 -0300 |
| commit | 6e66744d4c4bd94bb7e34f4243de0213334a31c5 (patch) | |
| tree | 31e2119174abef42d4306278958c967938a5275e /src | |
| parent | cd1ed48ddbbb487a40bbf2ecc55ca1d8377c1819 (diff) | |
| parent | 230c010050f424cee81c3bcf00b0f00a65819dcb (diff) | |
| download | emacs-6e66744d4c4bd94bb7e34f4243de0213334a31c5.tar.gz emacs-6e66744d4c4bd94bb7e34f4243de0213334a31c5.zip | |
Merge from origin/emacs-24
230c010 * net/tramp-sh.el (tramp-send-command-and-read): New optional arg MARKER. (tramp-get-remote-path): Use it.
Conflicts:
lisp/ChangeLog
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions