OSDN Git Service

Merge branch 'branch_0.12.0'
authorAtsushi Konno <atkonn@gmail.com>
Tue, 6 Oct 2009 16:50:51 +0000 (01:50 +0900)
committerAtsushi Konno <atkonn@gmail.com>
Tue, 6 Oct 2009 16:50:51 +0000 (01:50 +0900)
commit3483b7d0f5f9c63d531b8524942cc8552e928227
tree18f61c2ecce6a3ffc3b816e07df8bede566c0522
parentc6442165e7636d116acf630d41ff406dee824072
parent6c305366e32b6490f75d0a823d90d40443f00f56
Merge branch 'branch_0.12.0'

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