xserver: Branch 'server-1.7-nominations'

[Peter Hutterer]

 hw/xwin/X-boxed.ico   |binary
 hw/xwin/XWin.rc       |    1 +
 hw/xwin/winresource.h |    1 +
 3 files changed, 2 insertions(+)

New commits:
commit 37f857eb4cd30c6499a2735f59ddec87d1b7de57
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Mon Oct 19 11:50:56 2009 +1000

    Revert "Xming: Remove unused X-boxed icon resource"
    
    Breaks make dist.
    make[2]: *** No rule to make target `X-boxed.ico', needed by `distdir'.  Stop.
    
    This reverts commit 2969eaa88c4422fedf1b069e6fe055904b233db2.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

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