From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Sun, 24 Oct 2021 14:44:33 +0000 (+0900)
Subject: Merge remote-tracking branch 'upstream/master' into jp
X-Git-Tag: 2.16.16+-jp-1~5
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e0cd24ce662f87ef84965ac453b498a4eed65fc7;p=winmerge-jp%2Fwinmerge-jp.git

Merge remote-tracking branch 'upstream/master' into jp

# Conflicts:
#	Translations/WinMerge/Japanese.po
---

e0cd24ce662f87ef84965ac453b498a4eed65fc7