Merge commit '6a29d875d5ea2ac915bf1fb3b24c6bd136649e35' into test

author s_kawamoto <s_kawamoto@users.sourceforge.jp>

Mon, 16 Jan 2012 12:58:56 +0000 (21:58 +0900)

committer s_kawamoto <s_kawamoto@users.sourceforge.jp>

Mon, 16 Jan 2012 12:58:56 +0000 (21:58 +0900)
author s_kawamoto <s_kawamoto@users.sourceforge.jp>
Mon, 16 Jan 2012 12:58:56 +0000 (21:58 +0900)
committer s_kawamoto <s_kawamoto@users.sourceforge.jp>
Mon, 16 Jan 2012 12:58:56 +0000 (21:58 +0900)
diff --cc Resource/FFFTP.rc
Simple merge
diff --cc mesg-jpn.h
Simple merge
diff --cc mesg-jpn.old.h
Simple merge
author	s_kawamoto <s_kawamoto@users.sourceforge.jp>
	Mon, 16 Jan 2012 12:58:56 +0000 (21:58 +0900)
committer	s_kawamoto <s_kawamoto@users.sourceforge.jp>
	Mon, 16 Jan 2012 12:58:56 +0000 (21:58 +0900)
		1	2
Resource/FFFTP.rc	patch \|	diff1 \|	diff2 \|	blob \| history
mesg-jpn.h	patch \|	diff1 \|	diff2 \|	blob \| history
mesg-jpn.old.h	patch \|	diff1 \|	diff2 \|	blob \| history