diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-02-25 00:17:42 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-02-25 00:17:42 -0800 |
| commit | 0bf246ed663ad11d316fe7898a3fee3f57676d4b (patch) | |
| tree | 20476d64aecbb1b644ea1f307264c222b7d2e6f6 /indra/newview/llfloaterabout.cpp | |
| parent | c2ca71322bf48653d466cba40bbe01c3401318c7 (diff) | |
| parent | 109b79e9ad67b5fa8967442a47ef15e456eb5bff (diff) | |
Automated merge
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 775ccfa0d8..56bc4a7933 100644 --- a/indra/newview/llfloaterabout.cpp +++ b/indra/newview/llfloaterabout.cpp @@ -279,7 +279,7 @@ LLSD LLFloaterAbout::getInfo() } // 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) { |