OSDN Git Service

Merge branch 'branch_0.12.0'
authorAtsushi Konno <konn@users.sourceforge.jp>
Fri, 3 Apr 2009 05:27:53 +0000 (14:27 +0900)
committerAtsushi Konno <konn@users.sourceforge.jp>
Fri, 3 Apr 2009 05:27:53 +0000 (14:27 +0900)
commitb98ea8cc162a1e3380e4b85f7bd60657cbf857a3
tree5a456c126d9684c02a505ac7ed27f46bba19ee44
parentd092287d61be6c364db8658449e5a04454e9260f
parent9c2c4eca89c1167fe190f9811214f784bbf40d6e
Merge branch 'branch_0.12.0'

Conflicts:
configure
configure.ac
configure
configure.ac
src/Makefile.am
src/Makefile.in