diff options
author | Bryan O'Sullivan <bos@lindenlab.com> | 2008-06-02 21:14:31 +0000 |
---|---|---|
committer | Bryan O'Sullivan <bos@lindenlab.com> | 2008-06-02 21:14:31 +0000 |
commit | 9db949eec327df4173fde3de934a87bedb0db13c (patch) | |
tree | aeffa0f0e68b1d2ceb74d460cbbd22652c9cd159 /indra/newview/res/resource.h | |
parent | 419e13d0acaabf5e1e02e9b64a07648bce822b2f (diff) |
svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge
dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers
Diffstat (limited to 'indra/newview/res/resource.h')
-rw-r--r-- | indra/newview/res/resource.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/res/resource.h b/indra/newview/res/resource.h index 4f2e88f7f2..2268e81e83 100644 --- a/indra/newview/res/resource.h +++ b/indra/newview/res/resource.h @@ -30,7 +30,7 @@ //{{NO_DEPENDENCIES}} // Microsoft Visual C++ generated include file. -// Used by newViewRes.rc +// Used by viewerRes.rc // #define IDREMOVE 3 #define IDI_LL_ICON 103 |