Merge branch 'kmaeda-manual' into kitagawa_test

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

Wed, 16 Nov 2011 06:29:00 +0000 (15:29 +0900)

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

Wed, 16 Nov 2011 06:29:00 +0000 (15:29 +0900)
author Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Wed, 16 Nov 2011 06:29:00 +0000 (15:29 +0900)
committer Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Wed, 16 Nov 2011 06:29:00 +0000 (15:29 +0900)
diff --cc doc/man-en.pdf

index de256b9,ca1a847..e7409a8

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

index 4338e16,defe582..ac6465d

Binary files differ
diff --cc doc/manual.dtx
Simple merge
author	Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
	Wed, 16 Nov 2011 06:29:00 +0000 (15:29 +0900)
committer	Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
	Wed, 16 Nov 2011 06:29:00 +0000 (15:29 +0900)
		1	2
doc/man-en.pdf	patch \|	diff1 \|	diff2 \|	blob \| history
doc/man-ja.pdf	patch \|	diff1 \|	diff2 \|	blob \| history
doc/manual.dtx	patch \|	diff1 \|	diff2 \|	blob \| history