xserver: Branch 'server-1.7-nominations'

[Peter Hutterer]

 dev/null              |binary
 hw/xwin/Makefile.am   |    1 -
 hw/xwin/XWin.rc       |    1 -
 hw/xwin/winresource.h |    1 -
 4 files changed, 3 deletions(-)

New commits:
commit 55d3a77eb99c67ed05140f03e3fc4bf24011df35
Author: Colin Harrison <colin.harrison at virgin.net>
Date:   Fri Sep 25 17:49:59 2009 +0100

    Xming: Remove unused X-boxed icon resource
    
    Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>
    (cherry picked from commit 78c87bdad1feab91c2a39e01513b4b0826665f06)
    
    Squashed-into this commit:
    
    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>
    (cherry picked from commit 63f4bf39170eb2262617ef2dc95fd6d337b9dad5)

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 \
diff --git a/hw/xwin/X-boxed.ico b/hw/xwin/X-boxed.ico
deleted file mode 100755
index 0727042..0000000
Binary files a/hw/xwin/X-boxed.ico and /dev/null differ
diff --git a/hw/xwin/XWin.rc b/hw/xwin/XWin.rc
index 29c6f1c..df2664d 100644
--- a/hw/xwin/XWin.rc
+++ b/hw/xwin/XWin.rc
@@ -106,4 +106,3 @@ END
  */
 
 IDI_XWIN		ICON	"X.ico"
-IDI_XWIN_BOXED		ICON	"X-boxed.ico"
diff --git a/hw/xwin/winresource.h b/hw/xwin/winresource.h
index 5aa8840..7085117 100644
--- a/hw/xwin/winresource.h
+++ b/hw/xwin/winresource.h
@@ -37,7 +37,6 @@
 
 #define IDC_STATIC		-1
 #define IDI_XWIN		101
-#define IDI_XWIN_BOXED		102
 #define IDM_TRAYICON_MENU	103
 #define IDC_CLIENTS_CONNECTED	104