OSDN Git Service

Merge branch 'branch_0.13.0'
authorAtsushi Konno <konn@users.sourceforge.jp>
Sat, 26 Mar 2011 09:32:16 +0000 (18:32 +0900)
committerAtsushi Konno <konn@users.sourceforge.jp>
Sat, 26 Mar 2011 09:32:16 +0000 (18:32 +0900)
commit86bcee6fe7ef24fd2ff191b8532122cbe7138655
treef3a854a4e283a6ba7b72050f8127859e0a459efd
parent94538a34aa29eeae19fc40a3a458f4ef32854128
parentbd61d580c095549fbcd01a73fc4861da6bea234e
Merge branch 'branch_0.13.0'

Conflicts:
configure
configure.ac
include/config.h
support/centos/mod-chxj.spec
support/freebsd/Makefile
configure
include/config.h
src/Makefile.in
support/freebsd/Makefile