]> git.eshelyaron.com Git - emacs.git/commitdiff
; Merge from origin/emacs-26
authorGlenn Morris <rgm@gnu.org>
Thu, 30 Nov 2017 01:12:06 +0000 (17:12 -0800)
committerGlenn Morris <rgm@gnu.org>
Thu, 30 Nov 2017 01:12:06 +0000 (17:12 -0800)
The following commit was skipped:

340f74daa8 * src/w32heap.c (DUMPED_HEAP_SIZE) [_WIN64]: Bump to 22 MiB.


Trivial merge