From 96ecc6d28bba6bd6ebda3e02d43b7fd466d4ab67 Mon Sep 17 00:00:00 2001
From: Tim Angus <tim@ngus.net>
Date: Tue, 10 Jan 2006 02:26:28 +0000
Subject: * Removed Q3 icons * Removed ludwig's loki setup dir * Added
 Tremulous icons

---
 src/win32/background.bmp | Bin 197688 -> 0 bytes
 src/win32/clear.bmp      | Bin 5174 -> 0 bytes
 src/win32/icon2.ico      | Bin 766 -> 0 bytes
 src/win32/qe3.ico        | Bin 766 -> 0 bytes
 src/win32/winquake.rc    |  12 ++----------
 5 files changed, 2 insertions(+), 10 deletions(-)
 delete mode 100644 src/win32/background.bmp
 delete mode 100644 src/win32/clear.bmp
 delete mode 100644 src/win32/icon2.ico
 delete mode 100644 src/win32/qe3.ico

(limited to 'src/win32')

diff --git a/src/win32/background.bmp b/src/win32/background.bmp
deleted file mode 100644
index 88b3dabf..00000000
Binary files a/src/win32/background.bmp and /dev/null differ
diff --git a/src/win32/clear.bmp b/src/win32/clear.bmp
deleted file mode 100644
index 14516380..00000000
Binary files a/src/win32/clear.bmp and /dev/null differ
diff --git a/src/win32/icon2.ico b/src/win32/icon2.ico
deleted file mode 100644
index 8ba93283..00000000
Binary files a/src/win32/icon2.ico and /dev/null differ
diff --git a/src/win32/qe3.ico b/src/win32/qe3.ico
deleted file mode 100644
index a7f4f0a3..00000000
Binary files a/src/win32/qe3.ico and /dev/null differ
diff --git a/src/win32/winquake.rc b/src/win32/winquake.rc
index 0d78b89f..7022dfac 100644
--- a/src/win32/winquake.rc
+++ b/src/win32/winquake.rc
@@ -7,11 +7,7 @@
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
-#ifndef __MINGW32__
-#include "winres.h"
-#else
 #include <winresrc.h>
-#endif
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
@@ -57,11 +53,7 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-#ifndef __MINGW32__
-IDI_ICON1               ICON    DISCARDABLE     "qe3.ico"
-#else
-IDI_ICON1               ICON    DISCARDABLE     "../win32/qe3.ico"
-#endif
+IDI_ICON1               ICON    DISCARDABLE     "../../misc/tremulous.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -70,7 +62,7 @@ IDI_ICON1               ICON    DISCARDABLE     "../win32/qe3.ico"
 
 STRINGTABLE DISCARDABLE 
 BEGIN
-    IDS_STRING1             "Quake3"
+    IDS_STRING1             "Tremulous"
 END
 
 #endif    // English (U.S.) resources
-- 
cgit