OSDN Git Service

Merge branch 'master' of https://github.com/winmerge/winmerge into jp
authorTakashi Sawanaka <sdottaka@users.sourceforge.net>
Thu, 27 Jan 2022 13:54:07 +0000 (22:54 +0900)
committerTakashi Sawanaka <sdottaka@users.sourceforge.net>
Thu, 27 Jan 2022 13:54:07 +0000 (22:54 +0900)
commit250ea892633107e1805932634a6baf6f6daacc63
tree08a5b85323d2e4621669c4d18af989e326b0f4d4
parent2d8a0307ca81b4818d19de5b503107169d1fa1f4
parent9e9bd7ad8a1c172b973c1ce18d6a586f7ce433e0
Merge branch 'master' of https://github.com/winmerge/winmerge into jp

# Conflicts:
# SetVersion.cmd
# Version.h
SetVersion.cmd
Version.h