OSDN Git Service

Merge branch 'branch_0.13.0'
authorUser <konno@qsdn.co.jp>
Wed, 16 Mar 2011 10:43:59 +0000 (19:43 +0900)
committerUser <konno@qsdn.co.jp>
Wed, 16 Mar 2011 10:43:59 +0000 (19:43 +0900)
commit94538a34aa29eeae19fc40a3a458f4ef32854128
treee48834269a19842c7bc30ca146f333da179c771c
parent3adf5f80d0123ab56276dcc12b8392d60335b2eb
parentebb2eb102e47f1fb703bb9e9defc7c9860c49599
Merge branch 'branch_0.13.0'

Conflicts:
configure
src/css/configure
configure
configure.ac
include/config.h
src/Makefile.in
src/css/configure
support/freebsd/Makefile