diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2016-10-23 02:43:17 -0700 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-10-23 02:43:17 -0700 |
commit | 16d126d7559c2f58c8af6cf86c9f54b6e21cceb4 (patch) | |
tree | 3f053ef7e867308aa9f41315eed9163b28e5562e /lisp/dynamic-setting.el | |
parent | f39141b786525700c2619e5731c166e294265888 (diff) | |
parent | eb17d6f575de81dbbc113e474d28db0396c12714 (diff) | |
download | emacs-16d126d7559c2f58c8af6cf86c9f54b6e21cceb4.tar.gz emacs-16d126d7559c2f58c8af6cf86c9f54b6e21cceb4.tar.bz2 emacs-16d126d7559c2f58c8af6cf86c9f54b6e21cceb4.zip |
; Merge from origin/emacs-25
The following commits were skipped:
eb17d6f Port --enable-gcc-warnings to GCC 6.2.1
40c426a Work around Samba bug with ':' in symlink contents
Diffstat (limited to 'lisp/dynamic-setting.el')
0 files changed, 0 insertions, 0 deletions