xserver: Branch 'master'

[Keith Packard]

 test/.gitignore |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 6369b59668613e51131857fbaeaa393a65a73048
Author: Gaetan Nadon <memsize at videotron.ca>
Date:   Thu Dec 1 16:24:32 2011 -0500

    test: update .gitignore with xfree86 and sort alphabetically
    
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    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 7dcad36..e5aa9ec 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -1,7 +1,8 @@
-xkb
+fixes
 input
-xtest
 list
 misc
-fixes
 string
+xfree86
+xkb
+xtest