diff options
| author | Adam Moss <moss@lindenlab.com> | 2009-02-03 17:56:26 +0000 |
|---|---|---|
| committer | Adam Moss <moss@lindenlab.com> | 2009-02-03 17:56:26 +0000 |
| commit | e188badaf29a1a02307f93864eed6737096bd9a1 (patch) | |
| tree | 767259ad3385fd9ede9722e04752bea008469f8c /indra/newview/res/resource.h | |
| parent | 4ad54702fce32905402cb6055c085ac14de188a2 (diff) | |
QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergeme
svn merge -r108355:109316
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/maint-viewer-12-uploadfees-qa108314
Whew.
Diffstat (limited to 'indra/newview/res/resource.h')
| -rw-r--r-- | indra/newview/res/resource.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/indra/newview/res/resource.h b/indra/newview/res/resource.h index 1a1ace82ae..da27e47dfb 100644 --- a/indra/newview/res/resource.h +++ b/indra/newview/res/resource.h @@ -36,17 +36,9 @@ #define IDREMOVE 3 #define IDI_LL_ICON 103 #define IDC_GRABHAND 104 -#define IDR_MENU1 112 -#define IDD_DIALOG1 113 -#define IDI_INSTALL_ICON 133 #define IDC_CURSOR1 134 #define IDC_CURSOR2 136 -#define IDB_BITMAP1 138 -#define IDB_BITMAP2 140 -#define IDB_BITMAP3 144 #define IDC_CURSOR3 147 -#define IDB_BITMAP4 148 -#define IDB_BITMAP5 149 #define IDB_LOGIN 149 #define IDC_CURSOR4 153 #define IDC_CURSOR5 154 |