OSDN Git Service

Merge branch 'branch_0.12.0' into branch_0.13.0
authorAtsushi Konno <atkonn@gmail.com>
Tue, 1 Sep 2009 13:26:44 +0000 (22:26 +0900)
committerAtsushi Konno <atkonn@gmail.com>
Tue, 1 Sep 2009 13:26:44 +0000 (22:26 +0900)
commitfca5e58ac44ccfc0d06e0853a6909aac92fe71db
tree2a58f5c11e88e73fee8f715c5e4745839b5374f5
parent865d5c290afa59274f82133a3641cadebcff4681
parented471933668a72ec8cce4d66ed026fa06f72c5b8
Merge branch 'branch_0.12.0' into branch_0.13.0

Conflicts:
configure
configure.ac
include/config.h
src/mod_chxj.c
support/centos/mod-chxj.spec
include/mod_chxj.h
src/mod_chxj.c