diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-03-08 18:48:47 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-03-08 18:48:47 -0700 |
| commit | 0dfe7002a6b6f330b981e2d40f372bf71eeac1df (patch) | |
| tree | 3a5c701604b3193360d3f42ea0c213aae6ad6a4e /lisp/emacs-lisp/subr-x.el | |
| parent | 8e07ea1a05e801e52061e880aa36b7cec5895f5a (diff) | |
| parent | 9869d6f612e94437ac4a998454ad2d4f833a6ad8 (diff) | |
| download | emacs-0dfe7002a6b6f330b981e2d40f372bf71eeac1df.tar.gz emacs-0dfe7002a6b6f330b981e2d40f372bf71eeac1df.tar.bz2 emacs-0dfe7002a6b6f330b981e2d40f372bf71eeac1df.zip | |
Merge from origin/emacs-24
The following commit was skipped:
9869d6f Make tramp-ssh-controlmaster-options a defcustom. Do not merge with master.
Diffstat (limited to 'lisp/emacs-lisp/subr-x.el')
0 files changed, 0 insertions, 0 deletions