OSDN Git Service

Merge branch 'branch_0.12.0' into branch_0.13.0
authorAtsushi Konno <konn@users.sourceforge.jp>
Tue, 3 Mar 2009 17:52:35 +0000 (02:52 +0900)
committerAtsushi Konno <konn@users.sourceforge.jp>
Tue, 3 Mar 2009 17:52:35 +0000 (02:52 +0900)
commit9a2a0765d87975d8fe031695466509d75c75e87e
tree59ff85a376568e3f9a8d4de00288a2a1dc249e57
parenta5413b13ee138fa754fd7a23d3e2a2d6a53be5ff
parentdc2a3bb5784325aeacaed160e625cf8d4764ec86
Merge branch 'branch_0.12.0' into branch_0.13.0

Conflicts:
src/mod_chxj.c
20 files changed:
etc/device_data.xml
include/chxj_chtml10.h
include/chxj_chtml20.h
include/chxj_chtml30.h
include/chxj_chtml40.h
include/chxj_chtml50.h
include/chxj_jhtml.h
include/chxj_jxhtml.h
include/chxj_xhtml_mobile_1_0.h
include/mod_chxj.h
src/chxj_chtml10.c
src/chxj_chtml20.c
src/chxj_chtml30.c
src/chxj_chtml40.c
src/chxj_chtml50.c
src/chxj_jhtml.c
src/chxj_jxhtml.c
src/chxj_tag_util.c
src/chxj_xhtml_mobile_1_0.c
src/mod_chxj.c