OSDN Git Service

Merge branch 'branch_0.13.0'
authorAtsushi Konno <konn@users.sourceforge.jp>
Thu, 10 Mar 2011 10:44:41 +0000 (19:44 +0900)
committerAtsushi Konno <konn@users.sourceforge.jp>
Thu, 10 Mar 2011 10:44:41 +0000 (19:44 +0900)
commitc8f5aadefa6f2728745403ce8a29f87e71b6f603
treead96fe0875504779a7f6089583fe32b12945927b
parent2948e2ddbc7c6416172a48b668b6fa57bba95942
parentb02d924adc02efff66c5b7665ef1e2c054cac2f0
Merge branch 'branch_0.13.0'

Conflicts:

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