OSDN Git Service

Merge branch 'master' of https://github.com/winmerge/winmerge ShellExtension-1.17.10.0
authorTakashi Sawanaka <sdottaka@users.sourceforge.net>
Tue, 8 Oct 2019 22:42:34 +0000 (07:42 +0900)
committerTakashi Sawanaka <sdottaka@users.sourceforge.net>
Tue, 8 Oct 2019 22:42:34 +0000 (07:42 +0900)

Trivial merge