summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/fonts.xml
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2020-09-22 22:51:33 +0300
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2020-09-22 22:51:33 +0300
commit730af5d4888653ce2ccb4bae6dd3919619d58a30 (patch)
treeb9b5f7f7b9bfdca690c317dc8c90a23f0a2dd1bf /indra/newview/skins/default/xui/en/fonts.xml
parentbdedfb3755d54a6b4468a5251c9ddeae2b092d37 (diff)
parent60ed688026269568a9eef67437dc780f88c92871 (diff)
Merged master (DRTVWR-503) into DRTVWR-482
Diffstat (limited to 'indra/newview/skins/default/xui/en/fonts.xml')
-rw-r--r--indra/newview/skins/default/xui/en/fonts.xml2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/fonts.xml b/indra/newview/skins/default/xui/en/fonts.xml
index 76df0abdfd..d88c267a95 100644
--- a/indra/newview/skins/default/xui/en/fonts.xml
+++ b/indra/newview/skins/default/xui/en/fonts.xml
@@ -12,6 +12,7 @@
<file>msyh.ttc</file>
<file load_collection="true">Cambria.ttc</file>
<file>malgun.ttf</file>
+ <file>micross.ttf</file>
</os>
<os name="Mac">
<file>ヒラギノ角ゴシック W3.ttc</file>
@@ -25,6 +26,7 @@
<file>华文细黑.ttf</file>
<file>PingFang.ttc</file>
<file>STIXGeneral.otf</file>
+ <file>Thonburi.ttc</file>
</os>
</font>