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)
commitd377ddf7c6203cd567b4f4ad8a8dcb8c29bb2048
tree290c2582aa85110b65261c4307f2c77733084e67
parent0bcd33baae1280eea3d30e65d8fc51d33b4045e5
parent761941cf23368f5b8732ddfceab88e915385c31f
Merge branch 'master' of https://github.com/winmerge/winmerge