summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2016-08-05 14:07:01 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2016-08-05 14:07:01 -0700
commit20e1d54a3fbbcccaa46225be63ccfa2bc60d64c8 (patch)
tree5b609435fb29b6f62766ddd51d8649013913970e /lisp
parent1a86b5d6074d26d1a3a978cb52b2147b6f359694 (diff)
parenta5dcc97babfcb20bd146376fec99a20b9320e9be (diff)
downloademacs-20e1d54a3fbbcccaa46225be63ccfa2bc60d64c8.tar.gz
emacs-20e1d54a3fbbcccaa46225be63ccfa2bc60d64c8.tar.bz2
emacs-20e1d54a3fbbcccaa46225be63ccfa2bc60d64c8.zip
; Merge from origin/emacs-25
The following commit was skipped: a5dcc97 Fix open-network-stream responsiveness
Diffstat (limited to 'lisp')
0 files changed, 0 insertions, 0 deletions