From 404507ad58110d7efbafa254e6f231ff460f216c Mon Sep 17 00:00:00 2001
From: konn <konn@1a406e8e-add9-4483-a2c8-d8cac5b7c224>
Date: Fri, 5 Dec 2008 06:08:32 +0000
Subject: [PATCH] Merge branch 'branch_0.12.0' into branch_0.12.0-svn

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/branches/RELEASE_0_12_0@4578 1a406e8e-add9-4483-a2c8-d8cac5b7c224
---
 src/chxj_conv_kana.c                      | 2 +-
 test/chxj_conv_kana/test_chxj_conv_kana.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/chxj_conv_kana.c b/src/chxj_conv_kana.c
index 7529f038..aa038fe5 100644
--- a/src/chxj_conv_kana.c
+++ b/src/chxj_conv_kana.c
@@ -132,7 +132,7 @@ static kana_table_t kana_table3[] = {
   { /* 0x8176 」*/ 1, "\xa3",},
 };
 static kana_table_t kana_table4[] = {
-  { /* 0x815b ゛*/ 1, "-",},
+  { /* 0x815b ゛*/ 1, "\xb0",},
 };
 
 /**
diff --git a/test/chxj_conv_kana/test_chxj_conv_kana.c b/test/chxj_conv_kana/test_chxj_conv_kana.c
index 94fab5be..6fd4bd1b 100644
--- a/test/chxj_conv_kana/test_chxj_conv_kana.c
+++ b/test/chxj_conv_kana/test_chxj_conv_kana.c
@@ -159,7 +159,7 @@ void test_conv_kana_001()
                        "ｻｻﾞｼｼﾞｽｽﾞｾｾﾞｿｿﾞﾀﾀﾞﾁﾁﾞｯﾂﾂﾞﾃﾃﾞﾄﾄﾞ" \
                        "ﾅﾆﾇﾈﾉﾊﾊﾞﾊﾟﾋﾋﾞﾋﾟﾌﾌﾞﾌﾟﾍﾍﾞﾍﾟﾎﾎﾞﾎﾟ" \
                        "ﾏﾐﾑﾒﾓｬﾔｭﾕｮﾖﾗﾘﾙﾚﾛヮﾜヰヱｦﾝｳﾞヵヶ" \
-                       "､｡,.･:;?!ﾞﾟﾞﾟ｢｣-"
+                       "､｡,.･:;?!ﾞﾟﾞﾟ｢｣ｰ"
   char  *ret;
   device_table spec;
   chxjconvrule_entry entry;
-- 
2.11.0