Merge branch 'kmaeda-manual' into kitagawa_test

author Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>

Thu, 3 May 2012 00:39:42 +0000 (09:39 +0900)

committer Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>

Thu, 3 May 2012 00:39:42 +0000 (09:39 +0900)
author Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Thu, 3 May 2012 00:39:42 +0000 (09:39 +0900)
committer Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Thu, 3 May 2012 00:39:42 +0000 (09:39 +0900)
diff --cc doc/luatexja-en.pdf

index 6950ee1,dc3244c..9493535

Binary files differ
diff --cc doc/luatexja-ja.pdf

index c62b167,faa239b..e55a3c3

Binary files differ
diff --cc doc/luatexja.dtx
Simple merge
author	Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
	Thu, 3 May 2012 00:39:42 +0000 (09:39 +0900)
committer	Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
	Thu, 3 May 2012 00:39:42 +0000 (09:39 +0900)
		1	2
doc/luatexja-en.pdf	patch \|	diff1 \|	diff2 \|	blob \| history
doc/luatexja-ja.pdf	patch \|	diff1 \|	diff2 \|	blob \| history
doc/luatexja.dtx	patch \|	diff1 \|	diff2 \|	blob \| history