OSDN Git Service

* Merge branch 'branch_0.10.0' into branch_0.11.0
authorkonn <konn@1a406e8e-add9-4483-a2c8-d8cac5b7c224>
Sat, 19 Apr 2008 07:54:47 +0000 (07:54 +0000)
committerkonn <konn@1a406e8e-add9-4483-a2c8-d8cac5b7c224>
Sat, 19 Apr 2008 07:54:47 +0000 (07:54 +0000)
commit70e0d6a2014b0bae3b511d0dfec0cbb2681ea40a
tree0298d202ad84b886dbf1df478f6542c26dd59642
parent3a771009b380a55cdacaf888cab46a142f9a7c7d
  * Merge branch 'branch_0.10.0' into branch_0.11.0

Conflicts:

configure
configure.ac
include/config.h
src/chxj_node_exchange.c

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/branches/RELEASE_0_11_0@2402 1a406e8e-add9-4483-a2c8-d8cac5b7c224
ChangeLog
debian/changelog
src/chxj_node_exchange.c