From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Tue, 8 Oct 2019 22:42:34 +0000 (+0900)
Subject: Merge branch 'master' of https://github.com/winmerge/winmerge
X-Git-Tag: 2.16.5~64
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d377ddf7c6203cd567b4f4ad8a8dcb8c29bb2048;p=winmerge-jp%2Fwinmerge-jp.git

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

d377ddf7c6203cd567b4f4ad8a8dcb8c29bb2048