[Fontconfig] fontconfig: Branch 'master' - 2 commits

[Akira TAGOH]

 conf.d/65-nonlatin.conf |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 54dd481512265a247bd23663c8fdb290a8886ccd
Author: Akira TAGOH <akira at tagoh.org>
Date:   Tue Dec 20 18:46:14 2011 +0900

    Get rid of the unexpected family name
    
    UmePlus P Gothic isn't a serif font.

diff --git a/conf.d/65-nonlatin.conf b/conf.d/65-nonlatin.conf
index 1dbed95..36aa3e5 100644
--- a/conf.d/65-nonlatin.conf
+++ b/conf.d/65-nonlatin.conf
@@ -24,7 +24,6 @@
 			<family>padmaa</family> <!-- gujarati -->
 			<family>Hapax Berbère</family> <!-- tifinagh -->
 			<family>MS Mincho</family> <!-- han (ja) -->
-			<family>UmePlus P Gothic</family> <!-- han (ja) -->
 			<family>SimSun</family> <!-- han (zh-cn,zh-tw) -->
 			<family>PMingLiu</family> <!-- han (zh-tw) -->
 			<family>WenQuanYi Zen Hei</family> <!-- han (zh-cn,zh-tw) -->
commit 1c13fee11adcaae9eaaa08f9193a8c3c5b01504a
Author: MINAMI Hirokazu <minami at mistfall.net>
Date:   Tue Dec 20 18:36:35 2011 +0900

    Bug 43406 - typo of Japanese font name in conf.d/65-nonlatin.conf
    
    Fix a typo.
    
    Signed-off-by: Akira TAGOH <akira at tagoh.org>

diff --git a/conf.d/65-nonlatin.conf b/conf.d/65-nonlatin.conf
index e9788b0..1dbed95 100644
--- a/conf.d/65-nonlatin.conf
+++ b/conf.d/65-nonlatin.conf
@@ -23,7 +23,7 @@
 			<family>Sampige</family> <!-- kannada -->
 			<family>padmaa</family> <!-- gujarati -->
 			<family>Hapax Berbère</family> <!-- tifinagh -->
-			<family>MS Gothic</family> <!-- han (ja) -->
+			<family>MS Mincho</family> <!-- han (ja) -->
 			<family>UmePlus P Gothic</family> <!-- han (ja) -->
 			<family>SimSun</family> <!-- han (zh-cn,zh-tw) -->
 			<family>PMingLiu</family> <!-- han (zh-tw) -->