diff options
| author | Glenn Morris | 2017-06-11 16:20:41 -0700 |
|---|---|---|
| committer | Glenn Morris | 2017-06-11 16:20:41 -0700 |
| commit | 933f91a36f97d8705919a77bdc1d011010e89fbb (patch) | |
| tree | d987deada64358eb95861992995892d210019464 /src/buffer.c | |
| parent | 030df01c7cbdcccc7b3e3b987303b51072cd8137 (diff) | |
| parent | 16ef7539cb3f361b74a11606edf8fd8346b81cf5 (diff) | |
| download | emacs-933f91a36f97d8705919a77bdc1d011010e89fbb.tar.gz emacs-933f91a36f97d8705919a77bdc1d011010e89fbb.zip | |
; Merge from origin/emacs-25
The following commits were skipped:
16ef7539cb3 Don't advertise s_client in tls.el docs
94a6c964a45 Remove s_client usage from tls.el
Diffstat (limited to 'src/buffer.c')
0 files changed, 0 insertions, 0 deletions