livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge changes for storm-859

meow-7.2.2
Oz Linden 2011-05-18 18:24:13 -04:00
parent 03f7063c0b d7d94460d0
commit 35f394cd63
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/contributions.txt
View File

@ -158,6 +158,7 @@ Ann Congrejo
Ansariel Hiller
STORM-1101
Ardy Lay
STORM-859
VWR-19499
VWR-24917
Argent Stonecutter
@ -889,6 +890,7 @@ WolfPup Lowenhar
STORM-674
STORM-776
STORM-825
STORM-859
STORM-1098
VWR-20741
VWR-20933

1
indra/newview/res/resource.h
View File

@ -38,6 +38,7 @@
#define IDC_CURSOR5 154
#define IDI_LCD_LL_ICON 157
#define IDC_CURSOR6 158
#define IDC_STATIC 1000
#define IDC_RADIO_56 1000
#define IDC_RADIO_128 1001
#define IDC_RADIO_256 1002

4
indra/newview/res/viewerRes.rc
View File

@ -7,7 +7,7 @@
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include "winres.h"
#include "windows.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
@ -34,7 +34,7 @@ END
2 TEXTINCLUDE
BEGIN
"#include ""winres.h""\r\n"
"#include ""windows.h""\r\n"
"\0"
END