xserver: Branch 'server-1.18-branch'

[Adam Jackson]

 hw/xfree86/common/Makefile.am |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit d88f8ffeb7ec0304d793388be5b65a293505bc3b
Author: Adam Jackson <ajax at redhat.com>
Date:   Fri Mar 11 13:50:32 2016 -0500

    vidmode: Remove stray vidmodeproc.h from EXTRA_DIST
    
    Was removed from the tree in:
    
        commit f175cf45aebcdda53f3ae49c0eaf27da1f194e92
        Author: Olivier Fourdan <ofourdan at redhat.com>
        Date:   Wed Feb 10 09:34:34 2016 +0100
    
            vidmode: move to a separate library of its own
    
    but not removed from the Makefile, which broke 'make dist'.
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>
    (cherry picked from commit 744c292ae49dd1f9d33b860d2b4f0ae27023809b)

diff --git a/hw/xfree86/common/Makefile.am b/hw/xfree86/common/Makefile.am
index 2eed5de..caae7fd 100644
--- a/hw/xfree86/common/Makefile.am
+++ b/hw/xfree86/common/Makefile.am
@@ -67,7 +67,6 @@ CLEANFILES = $(BUILT_SOURCES)
 EXTRA_DIST = \
 	compiler.h \
 	fourcc.h \
-	vidmodeproc.h \
 	xf86.h \
 	xf86Bus.h \
 	xf86Config.h \