xserver: Branch 'master'

[Adam Jackson]

 Makefile.am |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit edaad0eff48219787d27f7723cd3d4d9b293de96
Author: Adam Jackson <ajax at redhat.com>
Date:   Thu Jun 29 13:57:37 2017 -0400

    automake: Add hw/xfree86/xkb/meson.build to EXTRA_DIST
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>

diff --git a/Makefile.am b/Makefile.am
index eacd957bd..55cdccba0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -178,6 +178,7 @@ EXTRA_DIST += \
 	hw/xfree86/vbe/meson.build \
 	hw/xfree86/vgahw/meson.build \
 	hw/xfree86/x86emu/meson.build \
+	hw/xfree86/xkb/meson.build \
 	hw/xnest/meson.build \
 	hw/xquartz/meson.build \
 	hw/xwayland/meson.build \