OSDN Git Service

Merge branch 'branch_0.12.0' into sandbox
authorkonn <konn@1a406e8e-add9-4483-a2c8-d8cac5b7c224>
Fri, 7 Nov 2008 15:31:55 +0000 (15:31 +0000)
committerkonn <konn@1a406e8e-add9-4483-a2c8-d8cac5b7c224>
Fri, 7 Nov 2008 15:31:55 +0000 (15:31 +0000)
commit5320597f1d4220404f59c9d1b1e0686aeb9bb631
tree8672cbfe4fb3394980071cd54668722fd11389cc
parent3ae446d4c3fd1949c47c90953e3789a745876854
parentb31d094ef1ccd88e953a1198ddc58ef6598c6367
Merge branch 'branch_0.12.0' into sandbox

Conflicts:

configure
configure.ac
src/Makefile.am
src/Makefile.in

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