diff options
author | Oz Linden <oz@lindenlab.com> | 2011-01-04 16:37:59 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-01-04 16:37:59 -0500 |
commit | 69b6aa5db2034e8e34bd234a4ebf04763419933a (patch) | |
tree | 5dd27272bed719fafb4bbb67a184cf57f0106406 /indra/newview/llfloaterabout.cpp | |
parent | 1a9b0523de81c9844aeaa13a3191d9881918bfa8 (diff) | |
parent | 12bc7eb0179d3154f929252c7ff95a4e8e244c0d (diff) |
merge changes for storm-669
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 8ae3ccbae3..2873bc0059 100644 --- a/indra/newview/llfloaterabout.cpp +++ b/indra/newview/llfloaterabout.cpp @@ -272,7 +272,7 @@ LLSD LLFloaterAbout::getInfo() } // TODO: Implement media plugin version query - info["QT_WEBKIT_VERSION"] = "4.6 (version number hard-coded)"; + info["QT_WEBKIT_VERSION"] = "4.7.1 (version number hard-coded)"; if (gPacketsIn > 0) { |