xserver: Branch 'master'

[Keith Packard]

 hw/xwin/Makefile.am |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit 63f4bf39170eb2262617ef2dc95fd6d337b9dad5
Author: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>
Date:   Mon Oct 19 13:07:26 2009 +1000

    Fix make dist after 78c87bdad1feab91c2a39e01513b4b0826665f06
    
    Signed-off-by: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/xwin/Makefile.am b/hw/xwin/Makefile.am
index 2c7972a..a76b569 100644
--- a/hw/xwin/Makefile.am
+++ b/hw/xwin/Makefile.am
@@ -196,7 +196,6 @@ EXTRA_DIST = \
 	$(GLX_EXTRAS) \
 	$(MAN_SRCS) \
 	_usr_X11R6_lib_X11_system.XWinrc \
-	X-boxed.ico \
 	X.ico \
 	XWin.rc \
 	xlaunch/config.cc \