diff options
| author | Glenn Morris | 2019-01-07 11:51:38 -0800 |
|---|---|---|
| committer | Glenn Morris | 2019-01-07 11:51:38 -0800 |
| commit | 1a07b12aaaefce9959297c72b73ef111bf2e866e (patch) | |
| tree | 3c6234368ba24a781a232903cda378a98af6c29c /src/coding.c | |
| parent | ff406671b10ad46d4b2b2abcabe0fdf64293c61c (diff) | |
| parent | f1ce72b7c6cd53265c1a3fa11d1111e44c16bf52 (diff) | |
| download | emacs-1a07b12aaaefce9959297c72b73ef111bf2e866e.tar.gz emacs-1a07b12aaaefce9959297c72b73ef111bf2e866e.zip | |
Merge from origin/emacs-26
f1ce72b ; ChangeLog.3 update
5b59cf0 * etc/AUTHORS: Update.
2cf20b6 * lisp/textmodes/mhtml-mode.el: Avoid loading flyspell. (Bug...
# Conflicts:
# ChangeLog.3
# lisp/textmodes/mhtml-mode.el
Diffstat (limited to 'src/coding.c')
0 files changed, 0 insertions, 0 deletions