OSDN Git Service

* Merge branch 'branch_0.12.0' into sandbox
authorkonn <konn@1a406e8e-add9-4483-a2c8-d8cac5b7c224>
Sat, 28 Jun 2008 09:00:17 +0000 (09:00 +0000)
committerkonn <konn@1a406e8e-add9-4483-a2c8-d8cac5b7c224>
Sat, 28 Jun 2008 09:00:17 +0000 (09:00 +0000)
commitb375d81f08c22819a181a84195afc479ecd05a16
tree3d0f7258e3a117a78ed3911058e56bba356736d4
parent140a1240a90f947fc3658fafd365b0c0367b2cbf
parent92149dbbf65a10c5a52418e16c5ec173931b42df
  * Merge branch 'branch_0.12.0' into sandbox

Conflicts:

include/chxj_str_util.h
src/Makefile.am
src/Makefile.in
src/chxj_str_util.c
src/serf/serfmake

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/branches/sandbox@2752 1a406e8e-add9-4483-a2c8-d8cac5b7c224
configure
configure.ac
include/chxj_str_util.h
include/mod_chxj.h
src/Makefile.am
src/Makefile.in
src/chxj_chtml10.c
src/chxj_str_util.c
src/mod_chxj.c