summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/tr
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2022-05-26 02:56:29 +0300
committerAndrey Lihatskiy <alihatskiy@productengine.com>2022-05-26 02:56:29 +0300
commit2ed401882e5ee28415c2ec70e6391855c006769f (patch)
tree7f433f9a6dc6751618c7271337a7e84f685e5727 /indra/newview/skins/default/xui/tr
parent23d310436a664f7303d627095f8972de6cb17334 (diff)
parentcdbd06e8ed6e3f4285a61f5c0b607a65dfdf8dfd (diff)
Merge branch 'master' into DRTVWR-483
# Conflicts: # indra/newview/llviewertexturelist.cpp
Diffstat (limited to 'indra/newview/skins/default/xui/tr')
-rw-r--r--indra/newview/skins/default/xui/tr/floater_about.xml1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/tr/floater_about.xml b/indra/newview/skins/default/xui/tr/floater_about.xml
index b91575954b..faa504a996 100644
--- a/indra/newview/skins/default/xui/tr/floater_about.xml
+++ b/indra/newview/skins/default/xui/tr/floater_about.xml
@@ -19,7 +19,6 @@ açık kaynak kod katkısında bulunanlar şunlardır:</text>
expat Telif Hakkı (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
FreeType Telif Hakkı (C) 1996-2002, 2006 David Turner, Robert Wilhelm ve Werner Lemberg.
GL Telif Hakkı (C) 1999-2004 Brian Paul.
- GLOD Telif Hakkı (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Johns Hopkins University ve David Luebke, Brenden Schubert, University of Virginia.
google-perftools Telif Hakkı (c) 2005, Google Inc.
Havok.com(TM) Telif Hakkı (C) 1999-2001, Telekinesys Research Limited.
jpeg2000 Telif Hakkı (C) 2001, David Taubman, The University of New South Wales (UNSW)