OSDN Git Service

Merge branch 'branch_0.13.0'
authorAtsushi Konno <konn@users.sourceforge.jp>
Thu, 10 Mar 2011 13:57:22 +0000 (22:57 +0900)
committerAtsushi Konno <konn@users.sourceforge.jp>
Thu, 10 Mar 2011 13:57:22 +0000 (22:57 +0900)
commita3722287b8f799b3d791ba6a163370efc391a925
treeee323c8c8994d06cd6127a13f73653ecc7acd915
parentc8f5aadefa6f2728745403ce8a29f87e71b6f603
parent5fabe5594ea23578476cc7fac363589133e4b1ec
Merge branch 'branch_0.13.0'

Conflicts:

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