summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerhelp.cpp
diff options
context:
space:
mode:
authorRichard Nelson <richard@lindenlab.com>2011-10-13 10:52:14 -0700
committerRichard Nelson <richard@lindenlab.com>2011-10-13 10:52:14 -0700
commitb3f2339cd712adcb9873de829bd863fcba247eff (patch)
tree367b39531bd7ef660557784f8a2b8fd8c91d388e /indra/newview/llviewerhelp.cpp
parent084169645a7e7d9228ef5fa9b0547cbf26510eef (diff)
parent211ad465bf97dd0c9c858671be94d397fbfaf67b (diff)
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui
Diffstat (limited to 'indra/newview/llviewerhelp.cpp')
-rw-r--r--indra/newview/llviewerhelp.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llviewerhelp.cpp b/indra/newview/llviewerhelp.cpp
index d1120b6269..a8a918f259 100644
--- a/indra/newview/llviewerhelp.cpp
+++ b/indra/newview/llviewerhelp.cpp
@@ -144,4 +144,3 @@ std::string LLViewerHelp::getTopicFromFocus()
return defaultTopic();
}
-