OSDN Git Service

Merge branch 'master' of https://github.com/winmerge/winmerge into jp 2.16.8+-jp-2 2.16.8+-jp-3
authorTakashi Sawanaka <sdottaka@users.sourceforge.net>
Sun, 27 Sep 2020 15:34:57 +0000 (00:34 +0900)
committerTakashi Sawanaka <sdottaka@users.sourceforge.net>
Sun, 27 Sep 2020 15:34:57 +0000 (00:34 +0900)
commit3a21842bb477d6b8d10ed561591090710e5afc33
tree9e26ba9b9544e9ddce67673cd792ba99864656fe
parent861e9c3a53953a295a1d578972ec2d9135e7d821
parent4ec51c47038ce0c4d74a3b8ba48c5af97f5dc065
Merge branch 'master' of https://github.com/winmerge/winmerge into jp