aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview
diff options
context:
space:
mode:
authorJacek Antonelli2010-08-26 16:40:39 -0500
committerJacek Antonelli2010-08-26 16:40:39 -0500
commit80482f82689801f61ef47168c58c7ae9a8cb2921 (patch)
tree26f7dc11d9606a13c7142a2586475e441a10706f /linden/indra/newview
parentAdded faad2 plugin for Mac. (diff)
downloadmeta-impy-80482f82689801f61ef47168c58c7ae9a8cb2921.zip
meta-impy-80482f82689801f61ef47168c58c7ae9a8cb2921.tar.gz
meta-impy-80482f82689801f61ef47168c58c7ae9a8cb2921.tar.bz2
meta-impy-80482f82689801f61ef47168c58c7ae9a8cb2921.tar.xz
Added faad2 license info.
Diffstat (limited to 'linden/indra/newview')
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_about.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_about.xml b/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
index 557c1d7..1370051 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
@@ -50,8 +50,9 @@ Henri Beauchamp, Inma Rau, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft
50 xmlrpc-epi Copyright (C) 2000 Epinions, Inc. 50 xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
51 zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler. 51 zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
52 google-perftools Copyright (c) 2005, Google Inc. 52 google-perftools Copyright (c) 2005, Google Inc.
53 Code from FAAD2 is copyright (c) Nero AG, www.nero.com
53 54
54 All rights reserved. See licenses.txt for details. 55 All rights reserved. See LICENSE-libraries.txt for details.
55 56
56 Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C) 57 Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
57 58