xserver: Branch 'master'

[Daniel Stone]

 .gitignore |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 7034484f0887ea0f8ab956515f2d9301ea5842ce
Author: Daniel Stone <daniel at fooishbar.org>
Date:   Fri Mar 28 10:23:36 2008 +0200

    gitignore: Add two more bits
    
    Get slightly better at ignoring vim swap files, and let people keep
    local changes if they want to.

diff --git a/.gitignore b/.gitignore
index fb2f7e5..837b038 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,11 +8,12 @@ Makefile.in
 *.a
 *.o
 *~
-.*.swp
+.*sw?
 *.pbxuser
 *.mode1v3
 obj*
 build*
+local
 aclocal.m4
 autom4te.cache
 compile