OSDN Git Service

Merge branch 'branch_0.12.0' into sandbox
authorkonn <konn@1a406e8e-add9-4483-a2c8-d8cac5b7c224>
Thu, 24 Jul 2008 07:41:37 +0000 (07:41 +0000)
committerkonn <konn@1a406e8e-add9-4483-a2c8-d8cac5b7c224>
Thu, 24 Jul 2008 07:41:37 +0000 (07:41 +0000)
commit6ab27cae70a054c2658315ed64f11b1492419916
tree522b1660331ba1eb4280ea8f640bffb20d907ce3
parentee2a7e5de56cb40c328100e9561346fbf67cf546
Merge branch 'branch_0.12.0' into sandbox

Conflicts:

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

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/branches/sandbox@3061 1a406e8e-add9-4483-a2c8-d8cac5b7c224
18 files changed:
ChangeLog
configure
configure.ac
debian-sarge/changelog
debian/changelog
include/chxj_tag_util.h
include/config.h
src/chxj_chtml10.c
src/chxj_chtml20.c
src/chxj_chtml30.c
src/chxj_chtml40.c
src/chxj_chtml50.c
src/chxj_cookie.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