xserver: Branch 'master'

[Keith Packard]

 test/.gitignore     |    1 +
 test/xi2/.gitignore |    1 +
 2 files changed, 2 insertions(+)

New commits:
commit e08ed0b757b9b48344a301f612fabb3e39ffec78
Author: Gaetan Nadon <memsize at videotron.ca>
Date:   Sun Feb 26 17:51:50 2012 -0500

    test: add new test cases to .gitignore
    
    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 e5aa9ec..5d4fdfa 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -3,6 +3,7 @@ input
 list
 misc
 string
+touch
 xfree86
 xkb
 xtest
diff --git a/test/xi2/.gitignore b/test/xi2/.gitignore
index 3e9816d..817aa7b 100644
--- a/test/xi2/.gitignore
+++ b/test/xi2/.gitignore
@@ -8,3 +8,4 @@ protocol-xiqueryversion
 protocol-xiselectevents
 protocol-xisetclientpointer
 protocol-xiwarppointer
+xi2