OSDN Git Service

Merge branch 'master' into branch_0.13.0
authorAtsushi Konno <konn@users.sourceforge.jp>
Wed, 10 Dec 2008 16:13:56 +0000 (01:13 +0900)
committerAtsushi Konno <konn@users.sourceforge.jp>
Wed, 10 Dec 2008 16:13:56 +0000 (01:13 +0900)
commit40154fb6cf6c674037e906ddd213c0d4b7bfcdea
treee82ae918df1b34af89ecec6e6ea45a5f8b7fb3d6
parent915d1ca9d398eac39e222e5bf8bf477a84dc4322
parent41276af253a838bad0221f85ee166c718a0b35b8
Merge branch 'master' into branch_0.13.0

Conflicts:
src/chxj_xhtml_mobile_1_0.c
test/chxj_ixhtml10/test_chxj_ixhtml10.c
test/chxj_ixhtml10/test_chxj_ixhtml10.c