diff options
| author | Colin Harrison <colin.harrison@virgin.net> | 2009-09-25 17:49:59 +0100 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-10-20 08:53:37 +1000 |
| commit | 55d3a77eb99c67ed05140f03e3fc4bf24011df35 (patch) | |
| tree | 696a35476e5211fd63627bd6ab8b4b8e6b765308 | |
| parent | 75e52c777c095abbd13a096dbda885019a0bc5ce (diff) | |
Xming: Remove unused X-boxed icon resource
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
(cherry picked from commit 78c87bdad1feab91c2a39e01513b4b0826665f06)
Squashed-into this commit:
Fix make dist after 78c87bdad1feab91c2a39e01513b4b0826665f06
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit 63f4bf39170eb2262617ef2dc95fd6d337b9dad5)
| -rw-r--r-- | hw/xwin/Makefile.am | 1 | ||||
| -rwxr-xr-x | hw/xwin/X-boxed.ico | bin | 12902 -> 0 bytes | |||
| -rw-r--r-- | hw/xwin/XWin.rc | 1 | ||||
| -rw-r--r-- | hw/xwin/winresource.h | 1 |
4 files changed, 0 insertions, 3 deletions
diff --git a/hw/xwin/Makefile.am b/hw/xwin/Makefile.am index 2c7972a7f..a76b56957 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 Binary files differdeleted file mode 100755 index 072704253..000000000 --- a/hw/xwin/X-boxed.ico +++ /dev/null diff --git a/hw/xwin/XWin.rc b/hw/xwin/XWin.rc index 29c6f1ccf..df2664dca 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 5aa884030..7085117e6 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 |