OSDN Git Service

Merge branch 'branch_0.12.0'
authorAtsushi Konno <konn@users.sourceforge.jp>
Thu, 8 Jan 2009 04:13:19 +0000 (13:13 +0900)
committerAtsushi Konno <konn@users.sourceforge.jp>
Thu, 8 Jan 2009 04:13:19 +0000 (13:13 +0900)
commit0be6986150ca0eb2ed94161dac89644bdd5fb97a
treec140fd784fa77b07cc56daa6d2eec1d3029e726f
parent5e95e775fbf4af5d77b70f3f50fc0756a33701e2
parent8ab13fa66dc01c2ef7d89d21f1b5e8033f1e2230
Merge branch 'branch_0.12.0'

Conflicts:
src/chxj_encoding.c
src/qs_parse_file.c
src/chxj_encoding.c
src/chxj_tag_util.c