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)
commit73dcf1835243715f8ccb2457cf6f93c6887b9de3
tree8672cbfe4fb3394980071cd54668722fd11389cc
parent2933de29f1cb63dd30ebd0c6b3a193b4e835c63e
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
19 files changed:
ChangeLog
Makefile.in
configure
configure.ac
debian-sarge/changelog
debian-sarge/rules
debian/changelog
debian/rules
etc/emoji.xml
include/config.h
src/Makefile.am
src/Makefile.in
src/chxj_cookie.c
src/chxj_memcache.c
src/mod_chxj.c
src/qs_parse_string.c
support/centos/chxj.conf [new file with mode: 0644]
support/centos/mod-chxj.spec [new file with mode: 0644]
support/centos/mod-chxj.spec.in [new file with mode: 0644]