summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterabout.cpp
diff options
context:
space:
mode:
authorDon Kjer <don@lindenlab.com>2010-12-22 14:24:28 -0800
committerDon Kjer <don@lindenlab.com>2010-12-22 14:24:28 -0800
commit0f5d8e53cad9afe4f5601c6a6cdd82ec474935e5 (patch)
tree25333fe8d8ba1c19b176d7feade03ccecfdd5829 /indra/newview/llfloaterabout.cpp
parent649dd6eb74023d48379ebaadd2ff000801306f17 (diff)
parentc86d6a7bbb7c0db7665b76cf52b12b90c6e98c6d (diff)
Merge with viewer-development
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)
{