OSDN Git Service

(root) / winmerge-jp / winmerge-jp.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9585d50 8fa4bf3)
Merge branch 'master' of https://github.com/winmerge/winmerge into jp 2.16.12+jp-1
authorTakashi Sawanaka <sdottaka@users.sourceforge.net>
Thu, 29 Apr 2021 02:12:20 +0000 (11:12 +0900)
committerTakashi Sawanaka <sdottaka@users.sourceforge.net>
Thu, 29 Apr 2021 02:12:20 +0000 (11:12 +0900)
commit8c7b380a13d55c751d9399f5c3363ac95f122046
treebadd2b769b92456d79e95069b016c8f0101f6d42tree | snapshot
parent9585d506db149dbd2fd8c291d9165c4e88ef45e0commit | diff
parent8fa4bf39dcd6ca394bdeb067d9bc4e2eae34a735commit | diff
Merge branch 'master' of https://github.com/winmerge/winmerge into jp

# Conflicts:
# SetVersion.cmd
# Version.h
SetVersion.cmd diff1 | diff2 | blob | history
Version.h diff1 | diff2 | blob | history
About OSDN
Find Software
Develop Software
Help