OSDN Git Service

Merge remote-tracking branch 'upstream/master' into jp
authorTakashi Sawanaka <sdottaka@users.sourceforge.net>
Sun, 26 Jun 2022 03:27:47 +0000 (12:27 +0900)
committerTakashi Sawanaka <sdottaka@users.sourceforge.net>
Sun, 26 Jun 2022 03:27:47 +0000 (12:27 +0900)
commitd543e1d350f409c0395462907c92453ab7a52461
tree98fd745aa2bfe0c77a85412fc9edca73331c8339
parent86b9d0d22969cef88bee75c5af42335f1559a103
parent84b8a3cf5f9f8f6904bdb237a2965b1a9fef8958
Merge remote-tracking branch 'upstream/master' into jp

# Conflicts:
# Externals/sevenzip
# SetVersion.cmd
# Version.h
Translations/WinMerge/Bulgarian.po
Translations/WinMerge/Italian.po