OSDN Git Service

Merge branch 'branch_0.12.0' into branch_0.13.0
authorAtsushi Konno <konn@users.sourceforge.jp>
Fri, 3 Apr 2009 05:29:18 +0000 (14:29 +0900)
committerAtsushi Konno <konn@users.sourceforge.jp>
Fri, 3 Apr 2009 05:29:18 +0000 (14:29 +0900)
commita6e6bac205c4f6248211a5981d65d64b6da54fee
treec4d82851a8822321b1f456f47e8904de1c61033e
parent052c2e04f9bbefb010081aeb7c3afb7e6feabc59
parent9c2c4eca89c1167fe190f9811214f784bbf40d6e
Merge branch 'branch_0.12.0' into branch_0.13.0

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