OSDN Git Service

Merge branch 'branch_0.12.0' into sandbox
authorkonn <konn@1a406e8e-add9-4483-a2c8-d8cac5b7c224>
Sat, 12 Jul 2008 14:04:08 +0000 (14:04 +0000)
committerkonn <konn@1a406e8e-add9-4483-a2c8-d8cac5b7c224>
Sat, 12 Jul 2008 14:04:08 +0000 (14:04 +0000)
commitbbb32672360275344b6e5b57279d25df18d2d00f
treedd0cb0424bde5230fda3a7961cb300828b290f93
parent2d07f0967ea35f4d8c47ad1ba535ab970b04b266
parent5877fb2a461f69c910b40882e95d189485953486
Merge branch 'branch_0.12.0' into sandbox

Conflicts:

configure
configure.ac

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/branches/sandbox@2889 1a406e8e-add9-4483-a2c8-d8cac5b7c224
configure
configure.ac
src/Makefile.am
src/Makefile.in
src/chxj_jxhtml.c
src/chxj_xhtml_mobile_1_0.c
src/mod_chxj.c