From: Takashi Sawanaka Date: Sun, 29 Dec 2019 10:54:22 +0000 (+0900) Subject: Merge branch 'master' of https://github.com/winmerge/winmerge into jp X-Git-Tag: 2.16.4+-jp-10~1 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c2a430fffaaacf7cc6e45e23e0e7b70e644b563c;p=winmerge-jp%2Fwinmerge-jp.git Merge branch 'master' of https://github.com/winmerge/winmerge into jp --- c2a430fffaaacf7cc6e45e23e0e7b70e644b563c