]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from origin/emacs-25
authorGlenn Morris <rgm@gnu.org>
Sun, 11 Jun 2017 23:20:40 +0000 (16:20 -0700)
committerGlenn Morris <rgm@gnu.org>
Sun, 11 Jun 2017 23:20:40 +0000 (16:20 -0700)
eaa00584ceb Improve documentation of 'gnutls-verify-error'
908498cc01b ; etc/PROBLEMS: Describe GTK-related crashes on elementar...
741daec617e ; Describe the problem with ksh when resizing shell window

1  2 
etc/PROBLEMS
lisp/net/gnutls.el

diff --cc etc/PROBLEMS
Simple merge
Simple merge