diff options
author | Christian Goetze <cg@lindenlab.com> | 2007-10-17 22:09:27 +0000 |
---|---|---|
committer | Christian Goetze <cg@lindenlab.com> | 2007-10-17 22:09:27 +0000 |
commit | aa8b0cbe690eef9ed4fb7f6f9e8cc75a0a073d76 (patch) | |
tree | 38f24f3ca670cdf3bb232b7bd9b134d606037614 /indra/newview/res | |
parent | 788c18c00db8dabdbcdc0ab1af2cf35c24eec8e9 (diff) |
QAR-25 svn merge -r71797:71803 svn+ssh://svn/svn/linden/branches/logitech_lcd_4
Diffstat (limited to 'indra/newview/res')
-rw-r--r-- | indra/newview/res/icon1.ico | bin | 0 -> 766 bytes | |||
-rw-r--r-- | indra/newview/res/resource.h | 3 |
2 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/res/icon1.ico b/indra/newview/res/icon1.ico Binary files differnew file mode 100644 index 0000000000..ad607598fa --- /dev/null +++ b/indra/newview/res/icon1.ico diff --git a/indra/newview/res/resource.h b/indra/newview/res/resource.h index c7e1552dff..e4d01b1050 100644 --- a/indra/newview/res/resource.h +++ b/indra/newview/res/resource.h @@ -19,6 +19,7 @@ #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 @@ -151,7 +152,7 @@ // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 156 +#define _APS_NEXT_RESOURCE_VALUE 167 #define _APS_NEXT_COMMAND_VALUE 40002 #define _APS_NEXT_CONTROL_VALUE 1139 #define _APS_NEXT_SYMED_VALUE 101 |