Merge branch 'master' of https://github.com/winmerge/winmerge into jp

author Takashi Sawanaka <sdottaka@users.sourceforge.net>

Sun, 29 Dec 2019 10:54:22 +0000 (19:54 +0900)

committer Takashi Sawanaka <sdottaka@users.sourceforge.net>

Sun, 29 Dec 2019 10:54:22 +0000 (19:54 +0900)
author Takashi Sawanaka <sdottaka@users.sourceforge.net>
Sun, 29 Dec 2019 10:54:22 +0000 (19:54 +0900)
committer Takashi Sawanaka <sdottaka@users.sourceforge.net>
Sun, 29 Dec 2019 10:54:22 +0000 (19:54 +0900)
diff --cc Src/MainFrm.cpp
Simple merge
diff --cc Src/MainFrm.h
Simple merge
author	Takashi Sawanaka <sdottaka@users.sourceforge.net>
	Sun, 29 Dec 2019 10:54:22 +0000 (19:54 +0900)
committer	Takashi Sawanaka <sdottaka@users.sourceforge.net>
	Sun, 29 Dec 2019 10:54:22 +0000 (19:54 +0900)
		1	2
Src/MainFrm.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
Src/MainFrm.h	patch \|	diff1 \|	diff2 \|	blob \| history