xserver: Branch 'master'

[Keith Packard]

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

New commits:
commit 1b3132f5e981b3398e08263742332cc966bebc07
Author: Gaetan Nadon <memsize at videotron.ca>
Date:   Thu Jan 7 14:12:34 2010 -0500

    xwin: ignore intermediate .man file
    
    Only detectable on a Cygwin build
    
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net
    Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/xwin/.gitignore b/hw/xwin/.gitignore
index a996950..a8c3a28 100644
--- a/hw/xwin/.gitignore
+++ b/hw/xwin/.gitignore
@@ -2,4 +2,5 @@
 winprefslex.c
 winprefsyacc.c
 winprefsyacc.h
-
+XWin.man
+XWinrc.man