]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d908829 d765175)
; Merge from origin/emacs-25
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 18 Jun 2016 22:54:28 +0000 (00:54 +0200)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 18 Jun 2016 22:54:28 +0000 (00:54 +0200)
The following commit was skipped:

d765175 Fix ifdef-vs-if typo with RANDR13_LIBRARY


Trivial merge