diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2016-12-07 12:41:05 -0800 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-12-07 12:41:05 -0800 |
commit | e22eabd5bcd6a840b4f4ff91e37a64c606c9751d (patch) | |
tree | 19ce0dc5b3b9a2db7aa1b854026517c7d6fb92e2 /lisp/emacs-lisp/ert.el | |
parent | e676b7b80b5c5bd65b7a9f28fdac631cf78c22db (diff) | |
parent | c49198967ae90f97e315dde5a4d1b234200f13df (diff) | |
download | emacs-e22eabd5bcd6a840b4f4ff91e37a64c606c9751d.tar.gz emacs-e22eabd5bcd6a840b4f4ff91e37a64c606c9751d.tar.bz2 emacs-e22eabd5bcd6a840b4f4ff91e37a64c606c9751d.zip |
; Merge from origin/emacs-25
The following commits were skipped:
c491989 Port to Sun C 5.14
95eb641 Fix mail-combine-fields
Diffstat (limited to 'lisp/emacs-lisp/ert.el')
0 files changed, 0 insertions, 0 deletions