xserver: Branch 'master'

[Keith Packard]

 test/.gitignore     |   16 ++++------------
 test/xi2/.gitignore |   10 ++++++++++
 2 files changed, 14 insertions(+), 12 deletions(-)

New commits:
commit 6326b0f0746ded410672ad0270d1c8a0e9cb59f9
Author: Gaetan Nadon <memsize at videotron.ca>
Date:   Wed Jun 8 15:17:59 2011 -0400

    Update .gitignore as new tests have been added
    
    Refactor to follow the pattern one Makefile, one .gitignore
    where needed.
    
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
    Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/test/.gitignore b/test/.gitignore
index 86e687f..48e8abe 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -1,15 +1,7 @@
 libxservertest.c
-
-input
-list
 xkb
+input
 xtest
-xi2/protocol-eventconvert
-xi2/protocol-xigetclientpointer
-xi2/protocol-xigetselectedevents
-xi2/protocol-xiquerydevice
-xi2/protocol-xiquerypointer
-xi2/protocol-xiqueryversion
-xi2/protocol-xiselectevents
-xi2/protocol-xisetclientpointer
-xi2/protocol-xiwarppointer
+list
+misc
+fixes
diff --git a/test/xi2/.gitignore b/test/xi2/.gitignore
new file mode 100644
index 0000000..3e9816d
--- /dev/null
+++ b/test/xi2/.gitignore
@@ -0,0 +1,10 @@
+protocol-eventconvert
+protocol-xigetclientpointer
+protocol-xigetselectedevents
+protocol-xipassivegrabdevice
+protocol-xiquerydevice
+protocol-xiquerypointer
+protocol-xiqueryversion
+protocol-xiselectevents
+protocol-xisetclientpointer
+protocol-xiwarppointer