OSDN Git Service

Merge branch 'branch_0.12.0'
authorAtsushi Konno <konn@users.sourceforge.jp>
Thu, 27 Nov 2008 18:05:38 +0000 (03:05 +0900)
committerAtsushi Konno <konn@users.sourceforge.jp>
Thu, 27 Nov 2008 18:05:38 +0000 (03:05 +0900)
commitd14b78d445a520dfda1a99b1656d3f7263cce0e7
tree9ceae00c3bc2b0d0b6fa427f744545d2fab06995
parentef02e0ad2a75a3c7019dccc51873ea8465e24044
parent8acb3289b9721b075488bd55eb9eb38b7857ce23
Merge branch 'branch_0.12.0'

Conflicts:
configure
configure.ac
etc/device_data.xml
include/chxj_encoding.h
include/config.h
src/Makefile.am
src/Makefile.in
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_xhtml_mobile_1_0.c
support/centos/mod-chxj.spec
14 files changed:
etc/device_data.xml
include/chxj_encoding.h
src/Makefile.am
src/Makefile.in
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_ixhtml10.c
src/chxj_jhtml.c
src/chxj_xhtml_mobile_1_0.c
src/mod_chxj.c