summaryrefslogtreecommitdiff
path: root/indra/newview/res
diff options
context:
space:
mode:
authorDon Kjer <don@lindenlab.com>2007-06-29 01:49:41 +0000
committerDon Kjer <don@lindenlab.com>2007-06-29 01:49:41 +0000
commitad04e5fc55e4bec0958e24e8dc897373eff4001f (patch)
tree622c614f5c8281302d1840e5c8b16ae7bf7829ff /indra/newview/res
parente3989d38486c4aaf4701d6239875ea4996d0963b (diff)
revert: svn merge -r 64506:64505 svn+ssh://svn/svn/linden/release back into release
reverting jakes accidental check in
Diffstat (limited to 'indra/newview/res')
-rw-r--r--indra/newview/res/icon1.icobin766 -> 0 bytes
-rw-r--r--indra/newview/res/resource.h3
2 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/res/icon1.ico b/indra/newview/res/icon1.ico
deleted file mode 100644
index ad607598fa..0000000000
--- a/indra/newview/res/icon1.ico
+++ /dev/null
Binary files 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