OSDN Git Service

Merge branch 'branch_0.12.0' into branch_0.13.0
authorAtsushi Konno <atkonn@gmail.com>
Tue, 6 Oct 2009 16:32:25 +0000 (01:32 +0900)
committerAtsushi Konno <atkonn@gmail.com>
Tue, 6 Oct 2009 16:32:25 +0000 (01:32 +0900)
commit35b57bc106a19d269651dafd7791ff72e01353d0
tree18f61c2ecce6a3ffc3b816e07df8bede566c0522
parent3977f0a1b72be2c820f7da9f5bdb1ee01f528fa0
parent6c305366e32b6490f75d0a823d90d40443f00f56
Merge branch 'branch_0.12.0' into branch_0.13.0

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