summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/fonts.xml
diff options
context:
space:
mode:
authorAnchor Linden <anchor@lindenlab.com>2018-05-21 16:47:42 -0700
committerAnchor Linden <anchor@lindenlab.com>2018-05-21 16:47:42 -0700
commit0fdbe7e34df55ac92302b4af38c42d03454d3bc1 (patch)
tree038c6087299c9096ac7c6606ec45a8339eb0fd72 /indra/newview/skins/default/xui/en/fonts.xml
parent3bf89821d9c9777a0f24d89280bd7a7011a7a3df (diff)
parentc70119ebabc4b06e2b0db02aea8c56e01fbc666e (diff)
Merge
Diffstat (limited to 'indra/newview/skins/default/xui/en/fonts.xml')
-rw-r--r--indra/newview/skins/default/xui/en/fonts.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/fonts.xml b/indra/newview/skins/default/xui/en/fonts.xml
index 550af03683..82027d9e7c 100644
--- a/indra/newview/skins/default/xui/en/fonts.xml
+++ b/indra/newview/skins/default/xui/en/fonts.xml
@@ -4,6 +4,7 @@
<font name="default" comment="default font files (global fallbacks)">
<file>DejaVuSans.ttf</file>
<os name="Windows">
+ <file>meiryo.TTC</file>
<file>MSGOTHIC.TTC</file>
<file>gulim.ttc</file>
<file>simhei.ttf</file>