OSDN Git Service

Merge commit '54fbba48345efc266d90204375d464738a31c3ba' into test
authors_kawamoto <s_kawamoto@users.sourceforge.jp>
Mon, 16 Jan 2012 13:11:55 +0000 (22:11 +0900)
committers_kawamoto <s_kawamoto@users.sourceforge.jp>
Mon, 16 Jan 2012 13:11:55 +0000 (22:11 +0900)
1  2 
Resource/FFFTP.rc
mesg-jpn.h
mesg-jpn.old.h

Simple merge
diff --cc mesg-jpn.h
Simple merge
diff --cc mesg-jpn.old.h
Simple merge