OSDN Git Service

Merge branch 'master' of https://github.com/borjafg/winmerge
authorborjafg <borjafg@users.noreply.github.com>
Mon, 17 Feb 2020 15:47:27 +0000 (16:47 +0100)
committerborjafg <borjafg@users.noreply.github.com>
Mon, 17 Feb 2020 15:47:27 +0000 (16:47 +0100)

Trivial merge