xserver: Branch 'master'

[GitLab Mirror]

 hw/xwayland/.gitignore |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 726e4230c6ffe3148f9877eba32287cfe8d158c1
Author: Sven Joachim <svenjoac at gmx.de>
Date:   Wed Oct 2 18:25:17 2019 +0200

    xwayland: Add more files to .gitignore
    
    Also sort the file again, missed in commit c8c276c9569b.

diff --git a/hw/xwayland/.gitignore b/hw/xwayland/.gitignore
index c0320b555..5ea38c055 100644
--- a/hw/xwayland/.gitignore
+++ b/hw/xwayland/.gitignore
@@ -1,9 +1,15 @@
 Xwayland
 drm-client-protocol.h
 drm-protocol.c
+linux-dmabuf-unstable-v1-client-protocol.h
+linux-dmabuf-unstable-v1-protocol.c
 pointer-constraints-unstable-v1-client-protocol.h
 pointer-constraints-unstable-v1-protocol.c
 relative-pointer-unstable-v1-client-protocol.h
 relative-pointer-unstable-v1-protocol.c
-linux-dmabuf-unstable-v1-client-protocol.h
-linux-dmabuf-unstable-v1-protocol.c
+tablet-unstable-v2-client-protocol.h
+tablet-unstable-v2-protocol.c
+xdg-output-unstable-v1-client-protocol.h
+xdg-output-unstable-v1-protocol.c
+xwayland-keyboard-grab-unstable-v1-client-protocol.h
+xwayland-keyboard-grab-unstable-v1-protocol.c