OSDN Git Service

Merge branch 'branch_0.12.0' into branch_0.13.0
authorAtsushi Konno <konn@users.sourceforge.jp>
Sat, 11 Apr 2009 09:06:15 +0000 (18:06 +0900)
committerAtsushi Konno <konn@users.sourceforge.jp>
Sat, 11 Apr 2009 09:06:15 +0000 (18:06 +0900)
commitc4d136b9282a6b016c5c99e34464e2ddb9fd3080
treedaacc80950bcc19655dc0cda85e56dbb284c70fd
parent7168ba47a2e02e147cd0c787d6c35447f7b33014
parentefaaf0b233f5fb5ebc8b68bf548d26192f3423ff
Merge branch 'branch_0.12.0' into branch_0.13.0

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