]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d6ec146 d8affa3)
Merge from origin/emacs-25
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 2 May 2016 01:14:22 +0000 (18:14 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 2 May 2016 01:14:22 +0000 (18:14 -0700)
commit595195a10e5dd568bf249f5fb6778ae3d7037cd5
treee973d6ef419ca9c48563b03587184e58ee0df5edtree | snapshot
parentd6ec146ff9b66a1849932f90f3a5edade28d4579commit | diff
parentd8affa3dc5267c5da120ac09e14a81e0afed8fe8commit | diff
Merge from origin/emacs-25

d8affa3 Use ‘T *restrict’ proto, not ‘T[restrict]’
d38d2a8 Fix documentation of 'url-retrieve-synchronously'
586b213 * lisp/url/url.el (url-retrieve-synchronously): Doc fix.  (Bu...

# Conflicts:
# doc/misc/url.texi
# lisp/url/url.el
doc/misc/url.texi diff1 | diff2 | blob | history
src/fns.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.