OSDN Git Service

Merge branch 'branch_0.13.0' into branch_0.13.0-svn
authorkonn <konn@1a406e8e-add9-4483-a2c8-d8cac5b7c224>
Tue, 7 Apr 2009 12:02:05 +0000 (12:02 +0000)
committerkonn <konn@1a406e8e-add9-4483-a2c8-d8cac5b7c224>
Tue, 7 Apr 2009 12:02:05 +0000 (12:02 +0000)
commit6bf46f09ea21f30d989fff73f045cb048d9ff1fa
tree72d6f6c0549675d80de009eaf4c319c59743cf71
parentefabfcb58af3853831f8bbaa6d6a95842261b321
Merge branch 'branch_0.13.0' into branch_0.13.0-svn

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/branches/RELEASE_0_13_0@4710 1a406e8e-add9-4483-a2c8-d8cac5b7c224
src/chxj_img_conv_format.c
src/mod_chxj.c