OSDN Git Service

Merge branch 'master' of https://github.com/winmerge/winmerge into jp
authorTakashi Sawanaka <sdottaka@users.sourceforge.net>
Wed, 26 Oct 2022 13:24:04 +0000 (22:24 +0900)
committerTakashi Sawanaka <sdottaka@users.sourceforge.net>
Wed, 26 Oct 2022 13:24:04 +0000 (22:24 +0900)
commit8b8f988913a96430f45ee72fe75bc266e08620c9
tree4628be8e5a34b68360e4fef8ab73110159752d5a
parent08727bb5ed4a9e9a4fd891670d66dd0c2856de5c
parentaa903ec5f3fcbf7aa2dac18b06a95d2898f2632a
Merge branch 'master' of https://github.com/winmerge/winmerge into jp

# Conflicts:
# SetVersion.cmd
# Version.h
SetVersion.cmd
Src/MainFrm.cpp
Version.h