aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2016-12-07 12:39:08 -0800
committerPaul Eggert2016-12-07 12:39:08 -0800
commit32b46fc82f1275d8e0c86340546db366dea48c8c (patch)
treeb4cf7ad204c611d20db93f846a0b4aebadd06d31 /src
parentfd6632b397316146397dd478a858f0b9a90efeed (diff)
parent46065291fa0807a10180b958285f5d375cf05914 (diff)
downloademacs-32b46fc82f1275d8e0c86340546db366dea48c8c.tar.gz
emacs-32b46fc82f1275d8e0c86340546db366dea48c8c.zip
; Merge from origin/emacs-25
The following commit was skipped: 4606529 ; ChangeLog.2 update
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions