OSDN Git Service

Merge branch 'branch_0.12.0' into branch_0.13.0
authorAtsushi Konno <konn@users.sourceforge.jp>
Fri, 10 Apr 2009 12:47:05 +0000 (21:47 +0900)
committerAtsushi Konno <konn@users.sourceforge.jp>
Fri, 10 Apr 2009 12:47:05 +0000 (21:47 +0900)
commit88b456a2cb3cee8ee48e466359d81c93160896e5
tree0b86f3a6bedebdcbbaf759408b2b26734f62eb5d
parentfc5dadbd921f3f46d87b643041a6c9f594ee2d97
parentf9432600a664f5bf114a4c2d6d9b8f0eca6eb1e4
Merge branch 'branch_0.12.0' into branch_0.13.0

Conflicts:
src/chxj_chtml40.c
src/chxj_chtml40.c