diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2007-07-18 21:22:40 +0000 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2007-07-18 21:22:40 +0000 |
| commit | ce7682c2a468e926d6b38e4f95bd289a8d26222c (patch) | |
| tree | 80535a3916676294d640b4ce47c1895d0a27cd1b /indra/win_crash_logger | |
| parent | e1ab7d8a30cc40cbd1d471c67def21508c82ff49 (diff) | |
svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
(only inside indra)
(josh) Original log message was:
svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
bos updated it to be:
svn merge -r64837:65269 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
However, it appears it actually was:
svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
... missing some file additions.
Diffstat (limited to 'indra/win_crash_logger')
| -rw-r--r-- | indra/win_crash_logger/resource.h | 8 | ||||
| -rw-r--r-- | indra/win_crash_logger/win_crash_logger.rc | 10 |
2 files changed, 3 insertions, 15 deletions
diff --git a/indra/win_crash_logger/resource.h b/indra/win_crash_logger/resource.h index 19233df390..ee6bf3d575 100644 --- a/indra/win_crash_logger/resource.h +++ b/indra/win_crash_logger/resource.h @@ -1,11 +1,3 @@ -/** - * @file resource.h - * @brief Resources for windows crash logger - * - * Copyright (c) 2003-$CurrentYear$, Linden Research, Inc. - * $License$ - */ - //{{NO_DEPENDENCIES}} // Microsoft Visual C++ generated include file. // Used by win_crash_logger.rc diff --git a/indra/win_crash_logger/win_crash_logger.rc b/indra/win_crash_logger/win_crash_logger.rc index f4c7eaa337..2c46859b95 100644 --- a/indra/win_crash_logger/win_crash_logger.rc +++ b/indra/win_crash_logger/win_crash_logger.rc @@ -81,14 +81,10 @@ BEGIN BS_AUTOCHECKBOX | WS_TABSTOP,4,106,89,13 LTEXT "Sending crash reports is the best way to help us improve the quality of %s.", IDC_STATIC_MOTIVATION,4,38,288,8 - LTEXT "If you continue to experience this problem, please try one of the following:", + LTEXT "If you continue to experience this problem, please try:", IDC_STATIC,4,57,251,8 - LTEXT "- Contact support by email at support@lindenlab.com", - IDC_STATIC,4,67,179,8 - LTEXT "- If you can log-in, please contact Live Help by using menu Help > Live Help.", - IDC_STATIC,4,87,249,8 - LTEXT "- Search the Second Life Knowledge Base at http://secondlife.com/knowledgebase/", - IDC_STATIC,4,77,281,8,SS_NOTIFY + LTEXT "- Contacting support by visiting http://www.secondlife.com/support", + IDC_STATIC,4,67,231,8 END IDD_PREVREPORTBOX DIALOG 100, 100, 232, 213 |