OSDN Git Service

Merge branch 'branch_0.12.0'
authorAtsushi Konno <konn@users.sourceforge.jp>
Tue, 16 Dec 2008 08:54:13 +0000 (17:54 +0900)
committerAtsushi Konno <konn@users.sourceforge.jp>
Tue, 16 Dec 2008 08:54:13 +0000 (17:54 +0900)
commit395b5dd181725434577a87f91854bcba89a0d761
tree8a9a349b570b6a03a50c115b3474ee1b01b50f8c
parent88f0a7b6b0eafc74b39628cd750a32662047c978
parent80a2c6865f36299e1497bde68a547483c6f5f86b
Merge branch 'branch_0.12.0'

Conflicts:
configure
configure.ac
include/config.h
src/Makefile.in
src/chxj_chtml10.c
src/chxj_jhtml.c
src/chxj_jxhtml.c
support/centos/mod-chxj.spec
13 files changed:
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_ixhtml10.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