diff options
| author | Lynx Linden <lynx@lindenlab.com> | 2010-01-14 11:58:05 +0000 |
|---|---|---|
| committer | Lynx Linden <lynx@lindenlab.com> | 2010-01-14 11:58:05 +0000 |
| commit | 4ed6b9516c2cc9c1a23096cea1eb9ae40472481a (patch) | |
| tree | dd212566156c7f88ee9ac25826375d46de048689 /indra/newview/llfloaterabout.cpp | |
| parent | 0556c2c047e38d9b5e18cd31b219764c3dc89aa4 (diff) | |
| parent | 507ccd52a9d398c76896e38db867716bc2acd7f9 (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
Diffstat (limited to 'indra/newview/llfloaterabout.cpp')
| -rw-r--r-- | indra/newview/llfloaterabout.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloaterabout.cpp b/indra/newview/llfloaterabout.cpp index aa343b2f69..ef69f39ad2 100644 --- a/indra/newview/llfloaterabout.cpp +++ b/indra/newview/llfloaterabout.cpp @@ -269,7 +269,7 @@ LLSD LLFloaterAbout::getInfo() info["VIVOX_VERSION"] = gVoiceClient ? gVoiceClient->getAPIVersion() : LLTrans::getString("NotConnected"); // TODO: Implement media plugin version query - info["QT_WEBKIT_VERSION"] = "4.5.2 (version number hard-coded)"; + info["QT_WEBKIT_VERSION"] = "4.6 (version number hard-coded)"; if (gPacketsIn > 0) { |