Merge branch 'KaoriYa'
commit99f9dae8a9acc4c5b1a7757bbadcf8bdffd0fa19
authorKazuki Sakamoto <sakamoto@splhack.org>
Sun, 20 Dec 2009 05:20:57 +0000 (20 14:20 +0900)
committerKazuki Sakamoto <sakamoto@splhack.org>
Sun, 20 Dec 2009 05:20:57 +0000 (20 14:20 +0900)
tree94879f480e1756a7047bdf6a31241c0d3f56f059
parentc05ca192c7de3818c4778a6ccfeeef9c649dd5ea
parent004e87483a0d66f0209c23d7bddb6b85a9fa6d13
Merge branch 'KaoriYa'

Conflicts:
src/auto/configure
runtime/doc/tags
src/auto/configure
src/configure.in
src/fileio.c
src/main.c
src/mbyte.c