OSDN Git Service

Merge branch 'branch_0.13.0'
authorAtsushi Konno <konn@users.sourceforge.jp>
Wed, 16 Mar 2011 08:28:09 +0000 (17:28 +0900)
committerAtsushi Konno <konn@users.sourceforge.jp>
Wed, 16 Mar 2011 08:28:09 +0000 (17:28 +0900)
commitc69ec7a50bb440d9d1d075297137c74ba637e244
treec630be0d7fbf669312a549bd5dd39b18eab9091f
parent9a498ed5ff6261801f6c7c18c12fd3c32fbe2af7
parent3d522c67f7db3935da8af715aedefc66635cd16a
Merge branch 'branch_0.13.0'

Conflicts:

configure
configure.ac
include/config.h
src/Makefile.am
src/Makefile.in
src/css/config.status
src/css/configure
src/css/configure.ac
src/serf/Makefile.in
support/centos/mod-chxj.spec
src/Makefile.am
src/Makefile.in
src/css/configure
src/css/configure.ac
src/serf/Makefile.in
support/centos/mod-chxj.spec