From 9dbe107f4e547d1aec0a234eaa0e6f83dd987898 Mon Sep 17 00:00:00 2001
From: Kent Quirk <q@lindenlab.com>
Date: Thu, 18 Feb 2010 20:37:37 -0500
Subject: move base back to default because doing it as a backout was causing
 merge errors

---
 indra/newview/skins/default/xui/ja/floater_font_test.xml | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/ja/floater_font_test.xml

(limited to 'indra/newview/skins/default/xui/ja/floater_font_test.xml')

diff --git a/indra/newview/skins/default/xui/ja/floater_font_test.xml b/indra/newview/skins/default/xui/ja/floater_font_test.xml
new file mode 100644
index 0000000000..b853f395dd
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_font_test.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="contents" title="フォントのテスト">
+	<text name="linea">
+		オーバーライドテスト - Times Romanでここに表示されます。 （default/xui/en-us フォルダー内）
+	</text>
+</floater>
-- 
cgit v1.2.3