summaryrefslogtreecommitdiff
path: root/indra/newview/linux_tools
diff options
context:
space:
mode:
authorDon Kjer <don@lindenlab.com>2007-07-26 01:22:23 +0000
committerDon Kjer <don@lindenlab.com>2007-07-26 01:22:23 +0000
commit9746cf5310871f305a1419163c5adfbed3f1534b (patch)
treed1f1d278927683fe837173318cc0da1e3c2f8ca4 /indra/newview/linux_tools
parent4284da17878eb9f8ade673d172148d34887aa816 (diff)
EFFECTIVE MERGE: svn merge -r 65485:66133 svn+ssh://svn/svn/linden/branches/maintenance into release
This includes fixes to the maintenance-r66133 branch, and sync'ing up with release@r66392 ACTUAL MERGE: svn merge -r 66394:66435 svn+ssh://svn/svn/linden/branches/release-r66392 into release EQUIVALENT TO: svn merge -r 65485:66434 svn+ssh://svn/svn/linden/branches/maintenance-r66133 into release (plus branch sync'ing)
Diffstat (limited to 'indra/newview/linux_tools')
-rw-r--r--indra/newview/linux_tools/client-readme.txt5
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/linux_tools/client-readme.txt b/indra/newview/linux_tools/client-readme.txt
index 297fd0a063..e07384cc93 100644
--- a/indra/newview/linux_tools/client-readme.txt
+++ b/indra/newview/linux_tools/client-readme.txt
@@ -235,9 +235,8 @@ For problems and discussion concerning unofficial (not secondlife.com)
releases, please contact your packager or the SLDev mailing list:
<https://lists.secondlife.com/cgi-bin/mailman/listinfo/sldev>
-In-world help: Please use the 'Help' menu in the client for general
-non-Linux-specific Second Life help including live support from the fabulous
-'Help Request' team.
+In-world help: Please use the 'Help' menu in the client for various
+non-Linux-specific Second Life help options.
In-world discussion: There is a 'Linux Client Users' group
inside Second Life which is free to join. You can find it by pressing