diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-03-29 14:24:19 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-03-29 14:24:19 -0700 |
| commit | d16fb740912bf4874e7087f6f419427516047977 (patch) | |
| tree | 0704317ab37ce7a842d0cfe3b739d89e98d8b630 /lisp/emacs-lisp/ert.el | |
| parent | 97d44922da3c22b3973f95892bfa2ee4afc0ceac (diff) | |
| parent | 4d2e7e17547edda414129aeee910cd0334b4e85e (diff) | |
| download | emacs-d16fb740912bf4874e7087f6f419427516047977.tar.gz emacs-d16fb740912bf4874e7087f6f419427516047977.tar.bz2 emacs-d16fb740912bf4874e7087f6f419427516047977.zip | |
Merge from origin/emacs-24
4d2e7e1 Fixes: debbugs:19175
2e0cfcc Fix the preamble text of the DIR file we install (Bug#20213)
22ece83 src/w32proc.c: Describe in a comment w32 subprocess implementation.
Conflicts:
ChangeLog
src/ChangeLog
src/xterm.c
Diffstat (limited to 'lisp/emacs-lisp/ert.el')
0 files changed, 0 insertions, 0 deletions