OSDN Git Service

Merge branch 'branch_0.12.0' into branch_0.12.0-svn
authorkonn <konn@1a406e8e-add9-4483-a2c8-d8cac5b7c224>
Mon, 8 Dec 2008 16:46:45 +0000 (16:46 +0000)
committerkonn <konn@1a406e8e-add9-4483-a2c8-d8cac5b7c224>
Mon, 8 Dec 2008 16:46:45 +0000 (16:46 +0000)
commit1d0f96bb54dbc28f5691ae5a59797f8d93fccca1
treebb00e59ef0a8f80e897e6521fcdb160a204b45c1
parent465c064693b6067b51130a3cd5567eaa68c3b86a
Merge branch 'branch_0.12.0' into branch_0.12.0-svn

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/branches/RELEASE_0_12_0@4586 1a406e8e-add9-4483-a2c8-d8cac5b7c224
include/chxj_header_inf.h
src/chxj_header_inf.c
src/chxj_img_conv_format.c
src/mod_chxj.c