OSDN Git Service

Merge branch 'master' into kitagawa_test
authorHironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Sat, 18 Jan 2014 06:18:49 +0000 (15:18 +0900)
committerHironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Sat, 18 Jan 2014 06:18:49 +0000 (15:18 +0900)
commit2b3abd97c607a1a2c62ae9b0e726d5fe6573caca
treeed48fea554ac32c4ba795b560c53f8816e76d36a
parent84e60f7a55ae15e08f2cb9b6135aafec2c477bb4
parent18135cbb0325bbadc1faef041a1fbd9c9b4acba8
Merge branch 'master' into kitagawa_test
src/ltj-jfont.lua