xserver: Branch 'master'

[Greg Kroah-Hartman]

 .gitignore |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

New commits:
diff-tree 9742d55c820a260a42a4537502295931d4529deb (from d97a21acb878bc4e5e6542912fbd820503bba312)
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date:   Mon Jun 19 14:40:14 2006 -0700

    update .gitignore to handle Xprint move

diff --git a/.gitignore b/.gitignore
index ce396c9..8ae5358 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,12 +23,6 @@ xorg-server.pc
 stamp-h?
 do-not-use-config.h
 do-not-use-config.h.in
-XpConfig/C/print/Xprinters.ghostscript
-Xprint/Xprt
-Xprint/doc/Xprt.1x
-Xprint/doc/Xprt.man
-Xprint/dpmsstubs-wrapper.c
-Xprint/miinitext-wrapper.c
 afb/afbbltC.c
 afb/afbbltCI.c
 afb/afbbltG.c
@@ -216,6 +210,12 @@ hw/xfree86/xorg.c
 hw/xnest/Xnest
 hw/xnest/Xnest.1x
 hw/xnest/Xnest.man
+hw/xprint/Xprt
+hw/xprint/config/C/print/Xprinters.ghostscript
+hw/xprint/doc/Xprt.1x
+hw/xprint/doc/Xprt.man
+hw/xprint/dpmsstubs-wrapper.c
+hw/xprint/miinitext-wrapper.c
 include/dix-config.h
 include/kdrive-config.h
 include/xgl-config.h