OSDN Git Service

Merge branch 'branch_0.12.0' into branch_0.13.0
authorAtsushi Konno <konn@users.sourceforge.jp>
Fri, 10 Apr 2009 14:09:36 +0000 (23:09 +0900)
committerAtsushi Konno <konn@users.sourceforge.jp>
Fri, 10 Apr 2009 14:09:36 +0000 (23:09 +0900)
commit2875a36227ae3e3d13e514043ed066b150ecf7e4
tree89cea50680dd240ed94cce82ab69cf3825f1ab15
parenteabe3834776a9673df32994bc15b9c041b221948
parentbd17e494813612e3eb981ec686cfe0fb7668aa15
Merge branch 'branch_0.12.0' into branch_0.13.0

Conflicts:
src/chxj_chtml20.c
src/chxj_chtml30.c
src/chxj_chtml40.c
src/chxj_chtml50.c
src/chxj_encoding.c
src/chxj_jhtml.c
src/chxj_chtml10.c
src/chxj_chtml20.c
src/chxj_chtml30.c
src/chxj_chtml40.c
src/chxj_chtml50.c
src/chxj_encoding.c
src/chxj_jhtml.c
src/chxj_jxhtml.c
src/chxj_xhtml_mobile_1_0.c
src/mod_chxj.c