summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterabout.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-01-21 15:14:39 -0500
committerOz Linden <oz@lindenlab.com>2011-01-21 15:14:39 -0500
commit4652e26196ed43e3a2fdd5bbb2e6c4b6b8466719 (patch)
treede6ce52d54764b0cf7d0c33d17d1cd7e71ffad1b /indra/newview/llfloaterabout.cpp
parent3571e83b6413e0c1050540a6cddeeaa7c6ca91c1 (diff)
parent2d6228b4e0454c7d82770748eb572258c402319c (diff)
merge changes for storm-869
Diffstat (limited to 'indra/newview/llfloaterabout.cpp')
-rw-r--r--indra/newview/llfloaterabout.cpp2
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)
{