From ad04e5fc55e4bec0958e24e8dc897373eff4001f Mon Sep 17 00:00:00 2001 From: Don Kjer Date: Fri, 29 Jun 2007 01:49:41 +0000 Subject: revert: svn merge -r 64506:64505 svn+ssh://svn/svn/linden/release back into release reverting jakes accidental check in --- indra/newview/res/icon1.ico | Bin 766 -> 0 bytes indra/newview/res/resource.h | 3 +-- 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 indra/newview/res/icon1.ico (limited to 'indra/newview/res') diff --git a/indra/newview/res/icon1.ico b/indra/newview/res/icon1.ico deleted file mode 100644 index ad607598fa..0000000000 Binary files a/indra/newview/res/icon1.ico and /dev/null differ diff --git a/indra/newview/res/resource.h b/indra/newview/res/resource.h index e4d01b1050..c7e1552dff 100644 --- a/indra/newview/res/resource.h +++ b/indra/newview/res/resource.h @@ -19,7 +19,6 @@ #define IDB_LOGIN 149 #define IDC_CURSOR4 153 #define IDC_CURSOR5 154 -#define IDI_LCD_LL_ICON 157 #define IDC_RADIO_56 1000 #define IDC_RADIO_128 1001 #define IDC_RADIO_256 1002 @@ -152,7 +151,7 @@ // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 167 +#define _APS_NEXT_RESOURCE_VALUE 156 #define _APS_NEXT_COMMAND_VALUE 40002 #define _APS_NEXT_CONTROL_VALUE 1139 #define _APS_NEXT_SYMED_VALUE 101 -- cgit v1.2.3