OSDN Git Service

Merge branch 'branch_0.12.0'
authorAtsushi Konno <konn@users.sourceforge.jp>
Fri, 19 Dec 2008 14:04:59 +0000 (23:04 +0900)
committerAtsushi Konno <konn@users.sourceforge.jp>
Fri, 19 Dec 2008 14:04:59 +0000 (23:04 +0900)
commit346c7f331d9d769fcec3eb9cc30736147bbe4f42
tree364c611218877b6cf5a158b0d7950830084eab25
parent395b5dd181725434577a87f91854bcba89a0d761
parent3a1a8b657a0a6b9227c4668030891e32468548db
Merge branch 'branch_0.12.0'

Conflicts:
configure
configure.ac
include/config.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_xhtml_mobile_1_0.c
support/centos/mod-chxj.spec
12 files changed:
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_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