From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 18 Jun 2016 22:54:28 +0000 (+0200)
Subject: ; Merge from origin/emacs-25
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/f01684313faa9803ddc69e71b66d9a469f955348

; Merge from origin/emacs-25

The following commit was skipped:

d765175 Fix ifdef-vs-if typo with RANDR13_LIBRARY
---

f01684313faa9803ddc69e71b66d9a469f955348