Merge branch 'kmaeda-manual' into kitagawa_test

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

Wed, 18 Apr 2012 02:01:07 +0000 (11:01 +0900)

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

Wed, 18 Apr 2012 02:01:07 +0000 (11:01 +0900)
author Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Wed, 18 Apr 2012 02:01:07 +0000 (11:01 +0900)
committer Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Wed, 18 Apr 2012 02:01:07 +0000 (11:01 +0900)
diff --cc doc/man-en.pdf

index 82ab7ef,905a4ef..faf3cc6

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

index 228afad,a2719b5..628ed0d

Binary files differ
diff --cc doc/manual.dtx
Simple merge
author	Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
	Wed, 18 Apr 2012 02:01:07 +0000 (11:01 +0900)
committer	Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
	Wed, 18 Apr 2012 02:01:07 +0000 (11:01 +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