OSDN Git Service

Merge branch 'branch_0.12.0'
authorAtsushi Konno <konn@users.sourceforge.jp>
Fri, 10 Apr 2009 12:11:58 +0000 (21:11 +0900)
committerAtsushi Konno <konn@users.sourceforge.jp>
Fri, 10 Apr 2009 12:11:58 +0000 (21:11 +0900)
commitb20ef79e08aca67dd98ffe414a07659c523c3338
treeaab4af52351515ace0e3073034036aa371bffaa2
parentaf1d8995a9135adf0a8249b06d17b8b8d7c8f0ef
parentc4d72b4f93440e225129aee2b79a9710e6cfb79c
Merge branch 'branch_0.12.0'

Conflicts:
src/chxj_chtml20.c
src/chxj_chtml20.c