From: Takashi Sawanaka Date: Thu, 22 Jul 2021 13:32:08 +0000 (+0900) Subject: Merge branch 'master' of https://github.com/winmerge/winmerge into jp X-Git-Tag: 2.16.16+-jp-1~25 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a6ff615ad5be10af4c1425fdea098922de259e8e;p=winmerge-jp%2Fwinmerge-jp.git Merge branch 'master' of https://github.com/winmerge/winmerge into jp --- a6ff615ad5be10af4c1425fdea098922de259e8e