Merge with stable

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

Thu, 14 Mar 2019 11:08:47 +0000 (20:08 +0900)

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

Thu, 14 Mar 2019 11:08:47 +0000 (20:08 +0900)
author Takashi Sawanaka <sdottaka@users.sourceforge.net>
Thu, 14 Mar 2019 11:08:47 +0000 (20:08 +0900)
committer Takashi Sawanaka <sdottaka@users.sourceforge.net>
Thu, 14 Mar 2019 11:08:47 +0000 (20:08 +0900)
diff --cc Src/MainFrm.cpp
Simple merge
diff --cc Translations/WinMerge/Catalan.po
Simple merge
author	Takashi Sawanaka <sdottaka@users.sourceforge.net>
	Thu, 14 Mar 2019 11:08:47 +0000 (20:08 +0900)
committer	Takashi Sawanaka <sdottaka@users.sourceforge.net>
	Thu, 14 Mar 2019 11:08:47 +0000 (20:08 +0900)
		1	2
Src/MainFrm.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
Translations/WinMerge/Catalan.po	patch \|	diff1 \|	diff2 \|	blob \| history