OSDN Git Service

Merge branch 'kitagawa_direct' into kitagawa_test
authorHironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Sat, 1 Feb 2014 23:45:13 +0000 (08:45 +0900)
committerHironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Sat, 1 Feb 2014 23:45:13 +0000 (08:45 +0900)
commitea79dea334a110317b0d43a697a3403f55f8abfa
tree98ee5377b9c18928afc083cc6d366bc77625e00a
parent83820d4ab729852a3f6329f38445095638ac4e6d
parent7179c9a27e961a5f88fa05feb97f4583a7b866ec
Merge branch 'kitagawa_direct' into kitagawa_test

Conflicts:
doc/luatexja.dtx
src/ltj-adjust.lua
src/ltj-jfont.lua
src/ltj-jfont.lua