OSDN Git Service

Merge branch 'branch_0.13.0'
authorAtsushi Konno <konn@users.sourceforge.jp>
Fri, 11 Mar 2011 04:04:13 +0000 (13:04 +0900)
committerAtsushi Konno <konn@users.sourceforge.jp>
Fri, 11 Mar 2011 04:04:13 +0000 (13:04 +0900)
commit7203e21fff756e79b9bb2286afdc9beed79696f1
treef61cb20946e538ed17043758fb519344c5c2b08e
parenta3722287b8f799b3d791ba6a163370efc391a925
parent46e9943befbb5ad470d8473f9c4b462c941e0b88
Merge branch 'branch_0.13.0'

Conflicts:

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