OSDN Git Service

(root) / winmerge-jp / winmerge-jp.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: aa8d4b1 8b54130)
Merge branch 'master' of https://github.com/winmerge/winmerge into jp
authorTakashi Sawanaka <sdottaka@users.sourceforge.net>
Tue, 26 Oct 2021 13:12:23 +0000 (22:12 +0900)
committerTakashi Sawanaka <sdottaka@users.sourceforge.net>
Tue, 26 Oct 2021 13:12:23 +0000 (22:12 +0900)
commit31b5092cdca359c3f4c8cc90ce151ad752ac1393
treed730262c67d8e459e545170e402b5adbf1688353tree | snapshot
parentaa8d4b1850e46b9261009d62fb51270083c0fa79commit | diff
parent8b54130d5cdb131d68747f6034802569c09c1daccommit | diff
Merge branch 'master' of https://github.com/winmerge/winmerge into jp

# Conflicts:
# SetVersion.cmd
# Version.h
SetVersion.cmd diff1 | diff2 | blob | history
Translations/WinMerge/Slovenian.po diff1 | diff2 | blob | history
Version.h diff1 | diff2 | blob | history
About OSDN
Find Software
Develop Software
Help