xserver: Branch 'master' - 2 commits

[David Nusinow]

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

New commits:
commit 16b0614c8c441eb1692bde9e58fadf54a9c6f00f
Merge: 1a88aed... e915a26...
Author: David Nusinow <dnusinow at debian.org>
Date:   Sat Jan 26 16:13:25 2008 -0500

    Merge commit 'upstream/master'

commit 1a88aed5c82c7c131e3d473ef7b8766a418fdf1b
Author: David Nusinow <dnusinow at debian.org>
Date:   Mon Jan 21 21:16:13 2008 -0500

    Add tags/TAGS to .gitignore for ctags usage

diff --git a/.gitignore b/.gitignore
index b52664b..406b74c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,6 +27,8 @@ install-sh
 libtool
 ltmain.sh
 missing
+TAGS
+tags
 ylwrap
 xorg-server.pc
 stamp-h?