diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-01-15 12:35:10 +0200 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-01-15 12:35:10 +0200 |
| commit | 3cf98103561d79a6758bbb57662e1dc2e4a5198c (patch) | |
| tree | 492ca7bd797c34ed29e927e649c5aa3582ff9f49 /indra/newview/llfloaterabout.cpp | |
| parent | eb12963eec5ffad5c8be59e97301fa98ef4dda7a (diff) | |
| parent | 30a47979a13af8d6c3e89ce5dddb5d7c37011012 (diff) | |
Merge with default branch
--HG--
branch : product-engine
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) { |