diff options
author | Roxie Linden <roxie@lindenlab.com> | 2010-04-19 16:24:05 -0700 |
---|---|---|
committer | Roxie Linden <roxie@lindenlab.com> | 2010-04-19 16:24:05 -0700 |
commit | 8d8f167a4e58583c55901448a7bc5dd88b60e5f7 (patch) | |
tree | b4c71519c8d9ae0fd1addece5ea1f1424ded313f /indra/newview/skins/default/xui/en/floater_about.xml | |
parent | 7f0a7789903809d489e9f85575be18c88df1ea98 (diff) | |
parent | b55bce5b1b74c612f3a411889df1e0fb57bc3264 (diff) |
automated merge with trunk
Diffstat (limited to 'indra/newview/skins/default/xui/en/floater_about.xml')
-rw-r--r-- | indra/newview/skins/default/xui/en/floater_about.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml index a6a4c79da4..b5be03346e 100644 --- a/indra/newview/skins/default/xui/en/floater_about.xml +++ b/indra/newview/skins/default/xui/en/floater_about.xml @@ -49,7 +49,7 @@ libcurl Version: [LIBCURL_VERSION] J2C Decoder Version: [J2C_VERSION] Audio Driver Version: [AUDIO_DRIVER_VERSION] Qt Webkit Version: [QT_WEBKIT_VERSION] -Vivox Version: [VIVOX_VERSION] +Voice Server Version: [VOICE_VERSION] </floater.string> <floater.string name="none"> |