xserver: Branch 'master'

[Keith Packard]

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

New commits:
commit 9c86d5f4f6f5d6d135a9f2f8eae904c6441e84e5
Author: Kristian Høgsberg <krh at bitplanet.net>
Date:   Tue Mar 25 14:57:12 2014 -0700

    .gitignore: Add new autotools file 'test-driver'
    
    Automake 1.12 introduces a new parallel test framework that uses a shell
    script helper and generates *.log and *.trs files.  Add to .gitignore.
    
    Signed-off-by: Kristian Høgsberg <krh at bitplanet.net>
    Reviewed-by: Gaetan Nadon <memsize at videotron.ca>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/.gitignore b/.gitignore
index 94a12fd..dc56b46 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,6 +41,7 @@ mkinstalldirs
 py-compile
 stamp-h?
 symlink-tree
+test-driver
 texinfo.tex
 ylwrap
 
diff --git a/test/.gitignore b/test/.gitignore
index da86d6e..a62fc3d 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -11,3 +11,5 @@ xfree86
 xkb
 xtest
 signal-logging
+*.log
+*.trs